Skip to content

fix(eso): remove argocd/annotations from example/dependencies base kustomization #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pinikomarov merged 1 commit into from
Jun 30, 2026
+11 −3
Merged

fix(eso): remove argocd/annotations from example/dependencies base kustomization #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions components/secrets/external-secrets-operator/redhat/externalsecretsconfig.yaml
View file
Open in desktop
Comment thread
pinikomarov marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
# ExternalSecretsConfig is required by the Red Hat External Secrets Operator (RHESO)
# to deploy the actual ESO controller pods (external-secrets, webhook, cert-controller).
# Sync wave and SkipDryRunOnMissingResource are managed centrally via
# components/argocd/annotations/kustomization.yaml.
# Sync wave and SkipDryRunOnMissingResource are managed via the argocd/annotations
# component patch, which must be included by the consumer in the ArgoCD Application
# spec (spec.source.kustomize.components) — not in the base kustomization.
apiVersion: operator.openshift.io/v1alpha1
kind: ExternalSecretsConfig
metadata:
Expand Down
9 changes: 8 additions & 1 deletion example/dependencies/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,11 @@ components:
- https://github.com/openstack-k8s-operators/architecture/lib/olm-deps?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c
- https://github.com/openstack-k8s-operators/architecture/lib/metallb?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c
- https://github.com/openstack-k8s-operators/architecture/lib/nmstate?ref=7da5f2e1dc2bfce99e269b0017783679ca405d8c
- https://github.com/openstack-k8s-operators/gitops/components/argocd/annotations?ref=v0.3.0
# The argocd/annotations component is intentionally NOT included here.
# It must be added by the consumer via the ArgoCD Application spec
# (spec.source.kustomize.components). Including it here AND in the app spec
# causes kustomize to deduplicate it — the component runs only once during
# base processing, before any app-level components (e.g. ESO) add their
# resources. Patches in the annotations component that target those
# app-level resources become no-ops, breaking sync-wave ordering and
# SkipDryRunOnMissingResource behaviour for CRs like ExternalSecretsConfig.
Loading