Skip to content

fix: offset all Argo CD sync-wave values by +31 to ensure positive waves #109

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
sabre1041 merged 4 commits into from
Apr 2, 2026
Merged

fix: offset all Argo CD sync-wave values by +31 to ensure positive waves #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c87035
fix: offset all Argo CD sync-wave values by +31 to ensure positive waves
minmzzhang Mar 20, 2026
20d89a2
fix: add sync-wave annotations, MCO wait gate, and updated docs
minmzzhang Mar 20, 2026
cf31a44
fix: apply +31 sync-wave offset to values-coco-dev.yaml and unpin clu…
minmzzhang Mar 24, 2026
20ffb69
fix: externalize Helm chart references in values-coco-dev.yaml
minmzzhang Apr 2, 2026
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
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ install: operator-deploy post-install ## installs the pattern and loads the secr
.PHONY: post-install
post-install: ## Post-install tasks
make load-secrets
@echo "Waiting for MachineConfigPool rollout to complete..."
oc wait mcp/master --for=condition=Updated --timeout=600s
make vault-config-jwt
@echo "Done"

Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/admin-password-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "5"
argocd.argoproj.io/sync-wave: "36"
type: Opaque
stringData:
password: {{ .Values.central.adminPassword.password | default (randAlphaNum 32) | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/central-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "10"
argocd.argoproj.io/sync-wave: "41"
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
spec:
central:
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/central-htpasswd-external-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "5"
argocd.argoproj.io/sync-wave: "36"
spec:
refreshInterval: 15s
secretStoreRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/console-link.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "15"
argocd.argoproj.io/sync-wave: "46"
spec:
href: https://central-{{ .Release.Namespace }}.{{ .Values.global.localClusterDomain }}
location: ApplicationMenu
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/jobs/create-auth-provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "13"
argocd.argoproj.io/sync-wave: "44"
spec:
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/jobs/create-cluster-init-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: "12"
argocd.argoproj.io/sync-wave: "43"
spec:
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/jobs/create-htpasswd-field.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "6"
argocd.argoproj.io/sync-wave: "37"
spec:
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/keycloak-client-secret-external-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "5"
argocd.argoproj.io/sync-wave: "36"
spec:
refreshInterval: 15s
secretStoreRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/rbac/cluster-init-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "1"
argocd.argoproj.io/sync-wave: "32"
rules:
- apiGroups: ["console.openshift.io"]
resources: ["consolelinks"]
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/rbac/cluster-init-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "1"
argocd.argoproj.io/sync-wave: "32"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/rbac/cluster-init-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "1"
argocd.argoproj.io/sync-wave: "32"
rules:
- apiGroups:
- ""
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/rbac/cluster-init-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "1"
argocd.argoproj.io/sync-wave: "32"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
2 changes: 1 addition & 1 deletion charts/acs-central/templates/rbac/cluster-init-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ metadata:
labels:
{{- include "acs-central.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "1"
argocd.argoproj.io/sync-wave: "32"
2 changes: 1 addition & 1 deletion charts/acs-secured-cluster/templates/secured-cluster-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "acs-secured-cluster.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "15"
argocd.argoproj.io/sync-wave: "46"
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
spec:
clusterName: {{ .Values.clusterName | default .Values.global.clusterName | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/noobaa-mcg/templates/bucket-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ .Values.noobaa.bucketClass.name }}
namespace: {{ .Values.noobaa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "3" # Layer 1: Create BucketClass
argocd.argoproj.io/sync-wave: "34" # Layer 1: Create BucketClass
spec:
placementPolicy:
tiers:
Expand Down
2 changes: 1 addition & 1 deletion charts/noobaa-mcg/templates/default-backingstore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: noobaa-default-backing-store
namespace: {{ .Values.noobaa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "1"
argocd.argoproj.io/sync-wave: "32"
spec:
type: pv-pool
pvPool:
Expand Down
2 changes: 1 addition & 1 deletion charts/noobaa-mcg/templates/noobaa-system.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: {{ .Values.noobaa.system.name }}
namespace: {{ .Values.noobaa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "2" # Layer 1: Deploy NooBaa System
argocd.argoproj.io/sync-wave: "33" # Layer 1: Deploy NooBaa System
spec:
tolerations:
- key: "node.ocs.openshift.io/storage"
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/app-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
argocd.argoproj.io/sync-wave: '20'
argocd.argoproj.io/sync-wave: '51'
labels:
app: qtodo
ztvp.io/uses-certificates: "true"
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/app-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
argocd.argoproj.io/sync-wave: '20'
argocd.argoproj.io/sync-wave: '51'
labels:
app: qtodo
name: qtodo
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/postgresql-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
argocd.argoproj.io/sync-wave: '10'
argocd.argoproj.io/sync-wave: '41'
labels:
app: qtodo-db
name: qtodo-db
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/postgresql-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
annotations:
argocd.argoproj.io/sync-wave: '10'
argocd.argoproj.io/sync-wave: '41'
labels:
app: qtodo-db
name: qtodo-db
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/qtodo-truststore-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: qtodo-truststore-java
namespace: qtodo
annotations:
argocd.argoproj.io/sync-wave: '10'
argocd.argoproj.io/sync-wave: '41'
labels:
app: qtodo
app.kubernetes.io/component: truststore-init
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/truststore-secret-external-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: qtodo-truststore-secret
namespace: {{ .Release.Namespace }}
annotations:
argocd.argoproj.io/sync-wave: '5'
argocd.argoproj.io/sync-wave: '36'
spec:
refreshInterval: 15s
secretStoreRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtas-operator/templates/securesign.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
{{- include "rhtas-operator.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "15" # Deploy after namespace and operator
argocd.argoproj.io/sync-wave: "46" # Deploy after namespace and operator
{{- if .Values.rhtas.monitoring.enabled }}
rhtas.redhat.com/metrics: "true"
{{- end }}
Expand Down
12 changes: 6 additions & 6 deletions charts/rhtpa-operator/templates/ingress-ca-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: rhtpa-ingress-ca-extractor
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "0"
argocd.argoproj.io/sync-wave: "31"
argocd.argoproj.io/hook: PreSync
---
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -15,7 +15,7 @@ metadata:
name: rhtpa-ingress-ca-extractor
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "0"
argocd.argoproj.io/sync-wave: "31"
argocd.argoproj.io/hook: PreSync
rules:
- apiGroups: [""]
Expand All @@ -28,7 +28,7 @@ metadata:
name: rhtpa-ingress-ca-extractor
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "0"
argocd.argoproj.io/sync-wave: "31"
argocd.argoproj.io/hook: PreSync
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -44,7 +44,7 @@ kind: ClusterRole
metadata:
name: rhtpa-ingress-ca-reader
annotations:
argocd.argoproj.io/sync-wave: "0"
argocd.argoproj.io/sync-wave: "31"
argocd.argoproj.io/hook: PreSync
rules:
# Read ingress CA from router secret (default or custom)
Expand All @@ -66,7 +66,7 @@ kind: ClusterRoleBinding
metadata:
name: rhtpa-ingress-ca-reader-{{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "0"
argocd.argoproj.io/sync-wave: "31"
argocd.argoproj.io/hook: PreSync
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -83,7 +83,7 @@ metadata:
name: rhtpa-ingress-ca-extractor
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "2"
argocd.argoproj.io/sync-wave: "33"
argocd.argoproj.io/hook: PreSync
argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/object-bucket-claim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: {{ .Values.rhtpa.objectStorage.objectBucketClaim.name }}
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "5" # Create OBC after NooBaa system is ready
argocd.argoproj.io/sync-wave: "36" # Create OBC after NooBaa system is ready
spec:
generateBucketName: {{ .Values.rhtpa.objectStorage.objectBucketClaim.bucketName }}
storageClassName: {{ .Values.rhtpa.objectStorage.objectBucketClaim.storageClass }}
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/oidc-cli-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
{{- include "rhtpa-operator.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "3" # Create before RHTPA CR
argocd.argoproj.io/sync-wave: "34" # Create before RHTPA CR
spec:
refreshInterval: 15s
secretStoreRef:
Expand Down
6 changes: 3 additions & 3 deletions charts/rhtpa-operator/templates/operator-readiness-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
labels:
{{- include "rhtpa-operator.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "40" # Before CR creation (wave 50)
argocd.argoproj.io/sync-wave: "71" # Before CR creation (wave 81)
policy.open-cluster-management.io/standards: NIST SP 800-53
policy.open-cluster-management.io/categories: CM Configuration Management
policy.open-cluster-management.io/controls: CM-2 Baseline Configuration
Expand Down Expand Up @@ -59,7 +59,7 @@ metadata:
labels:
{{- include "rhtpa-operator.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "40"
argocd.argoproj.io/sync-wave: "71"
placementRef:
name: placement-policy-rhtpa-operator-ready
kind: PlacementRule
Expand All @@ -77,7 +77,7 @@ metadata:
labels:
{{- include "rhtpa-operator.labels" . | nindent 4 }}
annotations:
argocd.argoproj.io/sync-wave: "40"
argocd.argoproj.io/sync-wave: "71"
spec:
clusterConditions:
- status: "True"
Expand Down
4 changes: 2 additions & 2 deletions charts/rhtpa-operator/templates/operator-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: rhtpa-operator-job-manager
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "1" # Create early, before CR
argocd.argoproj.io/sync-wave: "32" # Create early, before CR
rules:
- apiGroups: ["batch"]
resources: ["jobs"]
Expand All @@ -30,7 +30,7 @@ metadata:
name: rhtpa-operator-job-manager
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "1" # Create early, before CR
argocd.argoproj.io/sync-wave: "32" # Create early, before CR
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/postgresql-external-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: rhtpa-db-secret
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: '5'
argocd.argoproj.io/sync-wave: '36'
spec:
refreshInterval: 15s
secretStoreRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/postgresql-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
argocd.argoproj.io/sync-wave: '10'
argocd.argoproj.io/sync-wave: '41'
labels:
app: rhtpa-db
name: rhtpa-db
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/postgresql-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
argocd.argoproj.io/sync-wave: '5'
argocd.argoproj.io/sync-wave: '36'
name: rhtpa-db
namespace: {{ .Values.rhtpa.namespace }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/postgresql-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
annotations:
argocd.argoproj.io/sync-wave: '10'
argocd.argoproj.io/sync-wave: '41'
labels:
app: rhtpa-db
name: rhtpa-db
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/s3-credentials-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
name: rhtpa-s3-config
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "8" # After OBC is created
argocd.argoproj.io/sync-wave: "39" # After OBC is created
data:
# The OBC creates a secret with these keys automatically
# AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, BUCKET_HOST, BUCKET_NAME, BUCKET_PORT
Expand Down
2 changes: 1 addition & 1 deletion charts/rhtpa-operator/templates/spiffe-helper-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: spiffe-helper-config
namespace: {{ .Values.rhtpa.namespace }}
annotations:
argocd.argoproj.io/sync-wave: "18"
argocd.argoproj.io/sync-wave: "49"
data:
config.hcl: |
agent_address = "/spiffe-workload-api/spire-agent.sock"
Expand Down
Loading
Loading