fix(eso): remove argocd/annotations from example/dependencies base kustomization#63
Merged
pinikomarov merged 1 commit intoJun 30, 2026
Conversation
Contributor
Author
|
Tested to fix the issue on pipeline, commented on issue |
cjeanner
reviewed
Jun 30, 2026
736e2e9 to
2fc4a47
Compare
…stomization When the argocd/annotations component is included in both the base kustomization (example/dependencies) and the ArgoCD Application spec (spec.source.kustomize.components), kustomize deduplicates it and only processes it once — during base processing — before any app-level components (e.g. ESO) add their resources. Patches targeting those app-level resources become no-ops, causing SkipDryRunOnMissingResource and sync-wave annotations to never be applied to ExternalSecretsConfig. Without SkipDryRunOnMissingResource=true, ArgoCD fails the pre-sync dry-run for ExternalSecretsConfig because the ESO CRD does not exist yet (the ESO operator subscription is in sync-wave -10). The entire sync is aborted before any wave runs. Fix: remove the argocd/annotations component from the base kustomization. Consumers using the rhoso-apps helm chart already inject it via spec.source.kustomize.components, where it runs after all app-level components and patches apply correctly. A comment is added to prevent re-introduction of the component in the base. Also revert the externalsecretsconfig.yaml comment to reflect the correct design: annotations are applied via the component patch, not embedded directly in the resource. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2fc4a47 to
db01bd8
Compare
cjeanner
approved these changes
Jun 30, 2026
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.
Uh oh!
There was an error while loading. Please reload this page.