Skip to content

skaffold(cloud): add additive cockpit profile (upstream convention) - #76

Merged
entlein merged 1 commit into
mainfrom
skaffold-cockpit-profile
Jul 16, 2026
Merged

skaffold(cloud): add additive cockpit profile (upstream convention)#76
entlein merged 1 commit into
mainfrom
skaffold-cockpit-profile

Conversation

@ConstanzeTU

@ConstanzeTU ConstanzeTU commented Jul 1, 2026

Copy link
Copy Markdown

What

Adds a cockpit profile to skaffold/skaffold_cloud.yaml additively, following upstream skaffold conventions.

- name: cockpit
  patches:
  - op: replace
    path: /manifests/kustomize/paths
    value:
    - private/cockpit

Why this shape

The fork's current cockpit deploy (on the PR-68 branch) replaces all eight upstream profiles (minikube/dev/ory_auth/ory_auth_prod/staging/testing/prod/public) with a single cockpit profile and drops --action_env=GOOGLE_APPLICATION_CREDENTIALS. That diverges hard from upstream and makes the file painful to reconcile.

This PR instead keeps every upstream profile and .common_bazel_args untouched and appends cockpit as one more profile, mirroring the public pattern — a minimal, upstream-friendly diff (+10 lines).

Dependencies & the deployment-pipeline change

Draft

Marked draft because it's coupled to the external deployment-pipeline change above and the -p cockpit wiring. The profile shape (additive, path private/cockpit, keeping GOOGLE_APPLICATION_CREDENTIALS) is a proposal — easy to adjust.


Summary: Add an additive 'cockpit' profile to skaffold/skaffold_cloud.yaml (keeps all upstream profiles), replacing the fork's replace-all divergence.

Type of change: /kind cleanup

Test Plan: arc lint clean; +10-line additive diff; deploy via 'skaffold run -f skaffold/skaffold_cloud.yaml -p cockpit'.

@coderabbitai

coderabbitai Bot commented Jul 1, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 80a87df0-b25d-4e70-8bd0-5eee36061903

📥 Commits

Reviewing files that changed from the base of the PR and between 58e5bce and 75a0f77.

📒 Files selected for processing (1)
  • skaffold/skaffold_cloud.yaml

📝 Walkthrough

Walkthrough

Adds a cockpit Skaffold profile that replaces the Kustomize manifest path with private/cockpit, with comments documenting invocation and path restoration.

Changes

Cockpit profile

Layer / File(s) Summary
Cockpit manifest path override
skaffold/skaffold_cloud.yaml
Adds the cockpit profile and patches /manifests/kustomize/paths to use private/cockpit.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Suggested reviewers: ddelnano

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch skaffold-cockpit-profile

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Reworks the fork's cockpit deploy to fit upstream skaffold conventions:
instead of replacing all upstream profiles with a single cockpit profile
(the shape currently on the PR-68 branch), this keeps every upstream
profile (minikube/dev/ory_auth/staging/testing/prod/public) intact and
adds `cockpit` as one more profile, mirroring the `public` pattern.

Deploy the fork cloud with `skaffold run -f skaffold/skaffold_cloud.yaml
-p cockpit`. The kustomize target private/cockpit/ is restored by PR #72.

skaffold/** is already frozen in copybara ignored_dirs, so this survives
the OSS mirror. NOTE: the deployment pipeline that runs the cloud deploy
must pass `-p cockpit` — that change is external to this repo (no CI
workflow invokes skaffold_cloud.yaml; only DEVELOPMENT.md references it).
@entlein
entlein force-pushed the skaffold-cockpit-profile branch from 4c2cd36 to 75a0f77 Compare July 16, 2026 10:27
@entlein
entlein marked this pull request as ready for review July 16, 2026 10:33
@entlein
entlein merged commit 4861752 into main Jul 16, 2026
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants