feat: force-conflicts in pc-application install#473
Open
liamhess wants to merge 2 commits into
Open
Conversation
Signed-off-by: liamhess <me@liamhess.de>
liamhess
force-pushed
the
liam/pc-apps-force-conflicts
branch
from
0074f2f to
04d3520
Compare
Signed-off-by: liamhess <49128538+liamhess@users.noreply.github.com>
liamhess
requested review from
OliverTrautvetter
and removed request for
schrodit
OliverTrautvetter
requested changes
Jun 11, 2026
OliverTrautvetter
left a comment
OliverTrautvetter
left a comment
Member
There was a problem hiding this comment.
Looks very good in general, some small comments 👍
| }) | ||
| }) | ||
|
|
||
| Context("ForceConflicts", func() { |
Member
There was a problem hiding this comment.
The ForceConflicts test only covers the fresh install path -> fake client has no existing Helm release -> UpgradeChart with InstallIfNotExist: true falls through to InstallChart
So please add a second It block that seeds a fake release
| Expect(err).ToNot(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("returns an error when UpgradeChart fails", func() { |
Member
There was a problem hiding this comment.
It uses mock.Anything for all UpgradeChart parameters.
If ForceConflicts changes from false to true the test would still pass silently
| Registry credentials and chart URL are read automatically from the | ||
| Kubernetes secret "argocd-codesphere-oci-read" in the argocd namespace. | ||
| This secret is created by "oms beta install argocd --deploy-dc-config".`), | ||
| Example: formatExamples("beta install pc-apps", []packageio.Example{ |
Member
There was a problem hiding this comment.
we should add some example for the new flag
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
2 participants
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.
We had mutliple failed master deploys with the pc-application install conflicting on SSA managed fields.
Since the oms installer should have higher authority than the argo app controller it should be able to force field ownership to itself in the install step.
So we expose a force-conflicts option that alreay exists in the helm client to be used in the oms cli.