skaffold(cloud): add additive cockpit profile (upstream convention) - #76
Merged
Conversation
|
Caution Review failedThe pull request is closed. ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughAdds a ChangesCockpit profile
Estimated code review effort: 1 (Trivial) | ~5 minutes Suggested reviewers: ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
ddelnano
approved these changes
Jul 3, 2026
11 tasks
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
force-pushed
the
skaffold-cockpit-profile
branch
from
July 16, 2026 10:27
4c2cd36 to
75a0f77
Compare
entlein
marked this pull request as ready for review
July 16, 2026 10:33
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Adds a
cockpitprofile toskaffold/skaffold_cloud.yamladditively, following upstream skaffold conventions.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 singlecockpitprofile 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_argsuntouched and appendscockpitas one more profile, mirroring thepublicpattern — a minimal, upstream-friendly diff (+10 lines).Dependencies & the deployment-pipeline change
skaffold run -f skaffold/skaffold_cloud.yaml -p cockpit(previously the fork profile was the only one, so no-pwas needed). Whatever runs the actual cloud deploy must be updated to pass-p cockpit. No CI workflow in this repo invokesskaffold_cloud.yaml(onlyDEVELOPMENT.mdreferences it), so that pipeline is external/lab — out of scope for this PR.private/cockpit/is restored by PR Restore fork infra dropped by the #2391 main pickup (terraform, cockpit, sops, e2e workflow) #72; this profile points there. Merge Restore fork infra dropped by the #2391 main pickup (terraform, cockpit, sops, e2e workflow) #72 first (or together).skaffold/**is already inignored_dirs, so the mirror won't touch this.Draft
Marked draft because it's coupled to the external deployment-pipeline change above and the
-p cockpitwiring. The profile shape (additive, pathprivate/cockpit, keepingGOOGLE_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'.