Skip to content

Commit cf31a44

Browse files
committed
fix: apply +31 sync-wave offset to values-coco-dev.yaml and unpin clustergroup chart
Apply the same +31 sync-wave offset convention to values-coco-dev.yaml so all waves are positive, matching values-hub.yaml. Revert the temporary clusterGroupChartVersion pin (0.9.45 -> 0.9.*) since positive-only waves eliminate the issue that prompted it. Signed-off-by: Min Zhang <minzhang@redhat.com>
1 parent 20d89a2 commit cf31a44

3 files changed

Lines changed: 37 additions & 16 deletions

File tree

docs/SYNC-WAVE-INVENTORY.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Every sync-wave in the repository, in order. **App** = hub-level Argo CD Applica
7070
| 46 | └ rhtas-operator | chart | securesign |
7171
| 48 | supply-chain | **App** | |
7272
| 49 | └ rhtpa-operator | chart | spiffe-helper-config |
73+
| 51 | acs-policies | **App** | After ACS Central + Secured Cluster |
7374
| 51 | └ rhtpa-operator | chart | trusted-profile-analyzer (supporting objects) |
7475
| 51 | └ qtodo | chart | app-deployment, app-service |
7576
| 51 | └ supply-chain | chart | workspaces |
@@ -106,12 +107,32 @@ Every sync-wave in the repository, in order. **App** = hub-level Argo CD Applica
106107
| acs-secured-cluster | 15 | 46 ||
107108
| trusted-artifact-signer | 15 | 46 | Deploy after dependencies |
108109
| supply-chain || 48 | After RHTAS/ACS, before chart templates (newly added) |
110+
| acs-policies | 20 | 51 | After ACS Central + Secured Cluster |
111+
112+
## Application-level waves (`values-coco-dev.yaml`)
113+
114+
The CoCo development configuration reuses several of the same components. Only the active `compliance-scanning` wave differs from the commented-out defaults; other entries are commented out but updated for consistency.
115+
116+
| Application | Old | Current | Comment |
117+
| --- | ---: | ---: | --- |
118+
| compliance-scanning | -30 | 1 | Earliest app |
119+
| openshift-storage (OperatorGroup) | -5 | 26 | Commented; propagated to OperatorGroup |
120+
| quay-enterprise (namespace) | 1 | 32 | Commented; before NooBaa and Quay components |
121+
| trusted-artifact-signer (namespace) | 1 | 32 | Commented; auto-created by RHTAS operator |
122+
| odf (subscription) | -4 | 27 | Commented; after OperatorGroup (26) |
123+
| quay-operator (subscription) | -3 | 28 | Commented; after ODF operator |
124+
| rhtas-operator (subscription) | -2 | 29 | Commented; after Quay operator |
125+
| noobaa-mcg | 5 | 36 | Commented; deploy after core services |
126+
| quay-registry | 10 | 41 | Commented; deploy after NooBaa |
127+
| trusted-artifact-signer | 15 | 46 | Commented; deploy after dependencies |
109128

110129
## Chart-level waves (templates)
111130

112131
These control resource ordering within a single Application's sync. Template waves are resolved locally within each app, not globally across all apps.
113132

114-
### compliance-scanning (`charts/compliance-scanning/templates/`) — App wave: 1
133+
Charts marked **(external)** have been externalized to standalone repositories managed under [validatedpatterns](https://github.com/validatedpatterns). Their resource-level sync-wave annotations are maintained in those repos, not here. The tables below reflect the +31 offset values that each external chart should carry.
134+
135+
### compliance-scanning — **(external)** `ocp-compliance-scanning-chart` v0.0.3 — App wave: 1
115136

116137
| Resource | Old | Current |
117138
| --- | ---: | ---: |
@@ -139,14 +160,14 @@ These control resource ordering within a single Application's sync. Template wav
139160
| noobaa-system.yaml | 2 | 33 |
140161
| bucket-class.yaml | 3 | 34 |
141162

142-
### keycloak (`charts/keycloak/templates/`) — App wave: 35
163+
### keycloak **(external)** `rhbk-chart` v0.0.4 — App wave: 35
143164

144165
| Resource | Old | Current |
145166
| --- | ---: | ---: |
146167
| keycloak.yaml | 5 | 36 |
147168
| keycloak-realm-import.yaml | 10 | 41 |
148169

149-
### quay-registry (`charts/quay-registry/templates/`) — App wave: 41
170+
### quay-registry **(external)** `quay-chart` v0.1.3 — App wave: 41
150171

151172
| Resource | Old | Current |
152173
| --- | ---: | ---: |
@@ -226,7 +247,8 @@ These control resource ordering within a single Application's sync. Template wav
226247

227248
## Notes
228249

229-
- **"Old"** = value before the +31 offset. **""** = no sync-wave existed (defaulted to 0).
250+
- **"Old"** = value before the +31 offset. **"---"** = no sync-wave existed (defaulted to 0).
230251
- **"Current"** = value after the +31 offset plus newly added application-level annotations.
231252
- Template waves are resolved **locally within each app sync**, not globally. A template wave of 32 inside acs-central (app wave 41) does not conflict with a template wave of 32 inside noobaa-mcg (app wave 36); they run independently.
232253
- Sync waves control **Application creation order**, not readiness. A later wave means the Application resource is submitted to the hub later, but the earlier app's pods may not be fully running yet. For hard readiness gates, use Argo CD health checks or resource hooks.
254+
- **Externalized charts**: Five charts (certmanager, compliance-scanning, keycloak/RHBK, quay-registry, ZTWIM) are maintained in standalone repositories. Their resource-level sync-wave annotations are managed there and pinned via `chartVersion` in `values-hub.yaml`. Application-level sync-waves remain in this repository.

values-coco-dev.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ clusterGroup:
5656
# targetNamespace: openshift-storage
5757
# annotations:
5858
# openshift.io/cluster-monitoring: "true"
59-
# argocd.argoproj.io/sync-wave: "-5" # Propagated to OperatorGroup by framework
59+
# argocd.argoproj.io/sync-wave: "26" # Propagated to OperatorGroup by framework
6060
# - quay-enterprise:
6161
# annotations:
62-
# argocd.argoproj.io/sync-wave: "1" # Create before NooBaa and all Quay components
62+
# argocd.argoproj.io/sync-wave: "32" # Create before NooBaa and all Quay components
6363
# labels:
6464
# openshift.io/cluster-monitoring: "true"
6565
# RHTAS namespace (required when RHTAS application is enabled)
6666
# COMMENTED OUT: Uncomment to enable RHTAS with SPIFFE signing
6767
# - trusted-artifact-signer:
6868
# annotations:
69-
# argocd.argoproj.io/sync-wave: "1" # Auto-created by RHTAS operator
69+
# argocd.argoproj.io/sync-wave: "32" # Auto-created by RHTAS operator
7070
# labels:
7171
# openshift.io/cluster-monitoring: "true"
7272
- zero-trust-workload-identity-manager:
@@ -152,21 +152,21 @@ clusterGroup:
152152
# namespace: openshift-storage
153153
# channel: stable-4.19
154154
# annotations:
155-
# argocd.argoproj.io/sync-wave: "-4" # Install after OperatorGroup (-5)
155+
# argocd.argoproj.io/sync-wave: "27" # Install after OperatorGroup (26)
156156
# quay-operator:
157157
# name: quay-operator
158158
# namespace: openshift-operators
159159
# channel: stable-3.15
160160
# annotations:
161-
# argocd.argoproj.io/sync-wave: "-3" # Install after ODF operator
161+
# argocd.argoproj.io/sync-wave: "28" # Install after ODF operator
162162
# RHTAS operator subscription (required when RHTAS application is enabled)
163163
# COMMENTED OUT: Uncomment to enable RHTAS with SPIFFE integration
164164
# rhtas-operator:
165165
# name: rhtas-operator
166166
# namespace: openshift-operators
167167
# channel: stable
168168
# annotations:
169-
# argocd.argoproj.io/sync-wave: "-2" # Install after Quay operator, before applications
169+
# argocd.argoproj.io/sync-wave: "29" # Install after Quay operator, before applications
170170
# catalogSource: redhat-operators
171171
projects:
172172
- hub
@@ -220,7 +220,7 @@ clusterGroup:
220220
name: compliance-scanning
221221
namespace: openshift-compliance
222222
annotations:
223-
argocd.argoproj.io/sync-wave: '-30'
223+
argocd.argoproj.io/sync-wave: '1'
224224
project: hub
225225
path: charts/compliance-scanning
226226
vault:
@@ -251,15 +251,15 @@ clusterGroup:
251251
# project: hub
252252
# path: charts/noobaa-mcg
253253
# annotations:
254-
# argocd.argoproj.io/sync-wave: "5" # Deploy after core services
254+
# argocd.argoproj.io/sync-wave: "36" # Deploy after core services
255255
# Quay Container Registry (uses NooBaa for storage)
256256
# quay-registry:
257257
# name: quay-registry
258258
# namespace: quay-enterprise
259259
# project: hub
260260
# path: charts/quay-registry
261261
# annotations:
262-
# argocd.argoproj.io/sync-wave: "10" # Deploy after NooBaa storage backend
262+
# argocd.argoproj.io/sync-wave: "41" # Deploy after NooBaa storage backend
263263
# RHTAS with SPIFFE Integration
264264
# COMMENTED OUT: Uncomment to enable RHTAS with SPIFFE and Email issuers
265265
# Depends on: Vault, SPIRE, Keycloak (for Email OIDC issuer if used)
@@ -269,7 +269,7 @@ clusterGroup:
269269
# project: hub
270270
# path: charts/rhtas-operator
271271
# annotations:
272-
# argocd.argoproj.io/sync-wave: "15" # Deploy after dependencies
272+
# argocd.argoproj.io/sync-wave: "46" # Deploy after dependencies
273273
# overrides:
274274
# # OIDC Issuer Configuration - Both can be enabled simultaneously
275275
# # Enable SPIFFE issuer for workload identity

values-global.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ main:
99
clusterGroupName: hub
1010
multiSourceConfig:
1111
enabled: true
12-
# Pinned version to avoid issues introduced by https://github.com/validatedpatterns/clustergroup-chart/pull/103
13-
clusterGroupChartVersion: "0.9.45"
12+
clusterGroupChartVersion: "0.9.*"

0 commit comments

Comments
 (0)