Skip to content

Commit 65b832b

Browse files
authored
fix: apply +31 sync-wave offset to all resource annotations (#6)
Align with the layered-zero-trust pattern convention where all Argo CD sync-wave values are offset by +31 to ensure positive waves. 5 -> 36, 6 -> 37, 7 -> 38, 8 -> 39, 10 -> 41. Bump chart version to 0.1.3. Signed-off-by: Min Zhang <minzhang@redhat.com>
1 parent 690dbcc commit 65b832b

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: quay
33
description: Red Hat Quay Registry Resources
44
type: application
5-
version: 0.1.2
5+
version: 0.1.3
66
appVersion: "3.9"
77
home: https://github.com/validatedpatterns/quay-chart
88
maintainers:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- markdownlint-disable MD013 -->
44

5-
![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9](https://img.shields.io/badge/AppVersion-3.9-informational?style=flat-square)
5+
![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9](https://img.shields.io/badge/AppVersion-3.9-informational?style=flat-square)
66

77
<!-- markdownlint-enable MD013 -->
88

templates/object-bucket-claim.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: {{ .Values.objectStorage.objectBucketClaim.name }}
66
namespace: {{ .Values.quay.namespace }}
77
annotations:
8-
argocd.argoproj.io/sync-wave: "5" # Create OBC after NooBaa system is ready
8+
argocd.argoproj.io/sync-wave: "36" # Create OBC after NooBaa system is ready
99
spec:
1010
generateBucketName: {{ .Values.objectStorage.objectBucketClaim.bucketName }}
1111
storageClassName: {{ .Values.objectStorage.objectBucketClaim.storageClass }}

templates/quay-config-bundle-secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: {{ .Values.quay.configBundleSecret.name }}
55
namespace: {{ .Values.quay.namespace }}
66
annotations:
7-
argocd.argoproj.io/sync-wave: "7" # Layer 1: Create base config secret (template)
7+
argocd.argoproj.io/sync-wave: "38" # Layer 1: Create base config secret (template)
88
type: Opaque
99
stringData:
1010
config.yaml: |

templates/quay-registry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: quay-registry
55
namespace: {{ .Values.quay.namespace | default "quay-enterprise" }}
66
annotations:
7-
argocd.argoproj.io/sync-wave: "10" # Layer 1: Deploy Quay Registry
7+
argocd.argoproj.io/sync-wave: "41" # Layer 1: Deploy Quay Registry
88
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
99
spec:
1010
components:

templates/quay-s3-credentials-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: quay-s3-credentials-setup
66
namespace: {{ .Values.quay.namespace }}
77
annotations:
8-
argocd.argoproj.io/sync-wave: "8" # Layer 1: Setup S3 credentials
8+
argocd.argoproj.io/sync-wave: "39" # Layer 1: Setup S3 credentials
99
spec:
1010
template:
1111
spec:

templates/quay-s3-setup-serviceaccount.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: quay-s3-setup
66
namespace: {{ .Values.quay.namespace }}
77
annotations:
8-
argocd.argoproj.io/sync-wave: "6" # Layer 1: Create ServiceAccount/RBAC
8+
argocd.argoproj.io/sync-wave: "37" # Layer 1: Create ServiceAccount/RBAC
99
labels:
1010
app: quay-s3-setup
1111
---
@@ -15,7 +15,7 @@ metadata:
1515
name: quay-s3-setup
1616
namespace: {{ .Values.quay.namespace }}
1717
annotations:
18-
argocd.argoproj.io/sync-wave: "6" # Layer 1: Create ServiceAccount/RBAC
18+
argocd.argoproj.io/sync-wave: "37" # Layer 1: Create ServiceAccount/RBAC
1919
rules:
2020
# Read template secret and create new secret with real credentials in quay namespace
2121
- apiGroups: [""]
@@ -33,7 +33,7 @@ metadata:
3333
name: quay-s3-setup-quay-resources
3434
namespace: {{ .Values.quay.namespace }}
3535
annotations:
36-
argocd.argoproj.io/sync-wave: "6" # Layer 1: Create ServiceAccount/RBAC
36+
argocd.argoproj.io/sync-wave: "37" # Layer 1: Create ServiceAccount/RBAC
3737
rules:
3838
# ObjectBucketClaim access - OBC is in quay namespace
3939
- apiGroups: ["objectbucket.io"]
@@ -54,7 +54,7 @@ metadata:
5454
name: quay-s3-setup
5555
namespace: {{ .Values.quay.namespace }}
5656
annotations:
57-
argocd.argoproj.io/sync-wave: "6" # Layer 1: Create ServiceAccount/RBAC
57+
argocd.argoproj.io/sync-wave: "37" # Layer 1: Create ServiceAccount/RBAC
5858
subjects:
5959
- kind: ServiceAccount
6060
name: quay-s3-setup
@@ -70,7 +70,7 @@ metadata:
7070
name: quay-s3-setup-quay-resources
7171
namespace: {{ .Values.quay.namespace }}
7272
annotations:
73-
argocd.argoproj.io/sync-wave: "6" # Layer 1: Create ServiceAccount/RBAC
73+
argocd.argoproj.io/sync-wave: "37" # Layer 1: Create ServiceAccount/RBAC
7474
subjects:
7575
- kind: ServiceAccount
7676
name: quay-s3-setup

0 commit comments

Comments
 (0)