Skip to content

Commit 1e758d1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #539 from willie-yao/add-sync-wave
🌱 Add sync-wave annotations
2 parents 7e8c9cd + a93dff8 commit 1e758d1

12 files changed

+57
-0
lines changed

‎hack/charts/cluster-api-operator/templates/addon.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ metadata:
2828
annotations:
2929
"helm.sh/hook": "post-install"
3030
"helm.sh/hook-weight": "1"
31+
"argocd.argoproj.io/sync-wave": "1"
3132
name: {{ $addonNamespace }}
3233
---
3334
apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -38,6 +39,7 @@ metadata:
3839
annotations:
3940
"helm.sh/hook": "post-install"
4041
"helm.sh/hook-weight": "2"
42+
"argocd.argoproj.io/sync-wave": "2"
4143
{{- if or $addonVersion $.Values.secretName }}
4244
spec:
4345
{{- end}}

‎hack/charts/cluster-api-operator/templates/core.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ metadata:
3737
annotations:
3838
"helm.sh/hook": "post-install"
3939
"helm.sh/hook-weight": "2"
40+
"argocd.argoproj.io/sync-wave": "2"
4041
{{- if or $coreVersion $.Values.configSecret.name }}
4142
spec:
4243
{{- end}}

‎hack/charts/cluster-api-operator/templates/infra-conditions.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ metadata:
99
annotations:
1010
"helm.sh/hook": "post-install"
1111
"helm.sh/hook-weight": "1"
12+
"argocd.argoproj.io/sync-wave": "1"
1213
name: capi-kubeadm-bootstrap-system
1314
---
1415
apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -19,6 +20,7 @@ metadata:
1920
annotations:
2021
"helm.sh/hook": "post-install"
2122
"helm.sh/hook-weight": "2"
23+
"argocd.argoproj.io/sync-wave": "2"
2224
{{- with .Values.configSecret }}
2325
spec:
2426
configSecret:
@@ -37,6 +39,7 @@ metadata:
3739
annotations:
3840
"helm.sh/hook": "post-install"
3941
"helm.sh/hook-weight": "1"
42+
"argocd.argoproj.io/sync-wave": "1"
4043
name: capi-kubeadm-control-plane-system
4144
---
4245
apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -47,6 +50,7 @@ metadata:
4750
annotations:
4851
"helm.sh/hook": "post-install"
4952
"helm.sh/hook-weight": "2"
53+
"argocd.argoproj.io/sync-wave": "2"
5054
{{- with .Values.configSecret }}
5155
spec:
5256
configSecret:

‎hack/charts/cluster-api-operator/templates/infra.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ metadata:
2828
annotations:
2929
"helm.sh/hook": "post-install"
3030
"helm.sh/hook-weight": "1"
31+
"argocd.argoproj.io/sync-wave": "1"
3132
name: {{ $infrastructureNamespace }}
3233
---
3334
apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -38,6 +39,7 @@ metadata:
3839
annotations:
3940
"helm.sh/hook": "post-install"
4041
"helm.sh/hook-weight": "2"
42+
"argocd.argoproj.io/sync-wave": "2"
4143
{{- if or $infrastructureVersion $.Values.configSecret.name $.Values.manager }}
4244
spec:
4345
{{- end }}

‎test/e2e/resources/all-providers-custom-ns-versions.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
annotations:
77
"helm.sh/hook": "post-install"
88
"helm.sh/hook-weight": "1"
9+
"argocd.argoproj.io/sync-wave": "1"
910
name: helm-custom-ns
1011
---
1112
# Source: cluster-api-operator/templates/bootstrap.yaml
@@ -42,6 +43,7 @@ metadata:
4243
annotations:
4344
"helm.sh/hook": "post-install"
4445
"helm.sh/hook-weight": "1"
46+
"argocd.argoproj.io/sync-wave": "1"
4547
name: capd-custom-ns
4648
---
4749
# Source: cluster-api-operator/templates/addon.yaml
@@ -53,6 +55,7 @@ metadata:
5355
annotations:
5456
"helm.sh/hook": "post-install"
5557
"helm.sh/hook-weight": "2"
58+
"argocd.argoproj.io/sync-wave": "2"
5659
spec:
5760
version: v0.1.0-alpha.9
5861
---
@@ -95,6 +98,7 @@ metadata:
9598
annotations:
9699
"helm.sh/hook": "post-install"
97100
"helm.sh/hook-weight": "2"
101+
"argocd.argoproj.io/sync-wave": "2"
98102
spec:
99103
version: v1.5.4
100104
configSecret:
@@ -110,6 +114,7 @@ metadata:
110114
annotations:
111115
"helm.sh/hook": "post-install"
112116
"helm.sh/hook-weight": "2"
117+
"argocd.argoproj.io/sync-wave": "2"
113118
spec:
114119
version: v1.5.4
115120
configSecret:

‎test/e2e/resources/all-providers-custom-versions.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
annotations:
77
"helm.sh/hook": "post-install"
88
"helm.sh/hook-weight": "1"
9+
"argocd.argoproj.io/sync-wave": "1"
910
name: helm-addon-system
1011
---
1112
# Source: cluster-api-operator/templates/bootstrap.yaml
@@ -42,6 +43,7 @@ metadata:
4243
annotations:
4344
"helm.sh/hook": "post-install"
4445
"helm.sh/hook-weight": "1"
46+
"argocd.argoproj.io/sync-wave": "1"
4547
name: docker-infrastructure-system
4648
---
4749
# Source: cluster-api-operator/templates/addon.yaml
@@ -53,6 +55,7 @@ metadata:
5355
annotations:
5456
"helm.sh/hook": "post-install"
5557
"helm.sh/hook-weight": "2"
58+
"argocd.argoproj.io/sync-wave": "2"
5659
spec:
5760
version: v0.1.0-alpha.9
5861
---
@@ -95,6 +98,7 @@ metadata:
9598
annotations:
9699
"helm.sh/hook": "post-install"
97100
"helm.sh/hook-weight": "2"
101+
"argocd.argoproj.io/sync-wave": "2"
98102
spec:
99103
version: v1.5.4
100104
configSecret:
@@ -110,6 +114,7 @@ metadata:
110114
annotations:
111115
"helm.sh/hook": "post-install"
112116
"helm.sh/hook-weight": "2"
117+
"argocd.argoproj.io/sync-wave": "2"
113118
spec:
114119
version: v1.5.4
115120
configSecret:

‎test/e2e/resources/all-providers-latest-versions.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
annotations:
77
"helm.sh/hook": "post-install"
88
"helm.sh/hook-weight": "1"
9+
"argocd.argoproj.io/sync-wave": "1"
910
name: helm-addon-system
1011
---
1112
# Source: cluster-api-operator/templates/bootstrap.yaml
@@ -42,6 +43,7 @@ metadata:
4243
annotations:
4344
"helm.sh/hook": "post-install"
4445
"helm.sh/hook-weight": "1"
46+
"argocd.argoproj.io/sync-wave": "1"
4547
name: docker-infrastructure-system
4648
---
4749
# Source: cluster-api-operator/templates/addon.yaml
@@ -53,6 +55,7 @@ metadata:
5355
annotations:
5456
"helm.sh/hook": "post-install"
5557
"helm.sh/hook-weight": "2"
58+
"argocd.argoproj.io/sync-wave": "2"
5659
---
5760
# Source: cluster-api-operator/templates/bootstrap.yaml
5861
apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -91,6 +94,7 @@ metadata:
9194
annotations:
9295
"helm.sh/hook": "post-install"
9396
"helm.sh/hook-weight": "2"
97+
"argocd.argoproj.io/sync-wave": "2"
9498
spec:
9599
configSecret:
96100
name: test-secret-name
@@ -105,6 +109,7 @@ metadata:
105109
annotations:
106110
"helm.sh/hook": "post-install"
107111
"helm.sh/hook-weight": "2"
112+
"argocd.argoproj.io/sync-wave": "2"
108113
spec:
109114
configSecret:
110115
name: test-secret-name

‎test/e2e/resources/feature-gates.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
annotations:
77
"helm.sh/hook": "post-install"
88
"helm.sh/hook-weight": "1"
9+
"argocd.argoproj.io/sync-wave": "1"
910
name: helm-addon-system
1011
---
1112
# Source: cluster-api-operator/templates/core.yaml
@@ -24,6 +25,7 @@ metadata:
2425
annotations:
2526
"helm.sh/hook": "post-install"
2627
"helm.sh/hook-weight": "1"
28+
"argocd.argoproj.io/sync-wave": "1"
2729
name: capi-kubeadm-bootstrap-system
2830
---
2931
# Source: cluster-api-operator/templates/infra-conditions.yaml
@@ -33,6 +35,7 @@ metadata:
3335
annotations:
3436
"helm.sh/hook": "post-install"
3537
"helm.sh/hook-weight": "1"
38+
"argocd.argoproj.io/sync-wave": "1"
3639
name: capi-kubeadm-control-plane-system
3740
---
3841
# Source: cluster-api-operator/templates/infra.yaml
@@ -42,6 +45,7 @@ metadata:
4245
annotations:
4346
"helm.sh/hook": "post-install"
4447
"helm.sh/hook-weight": "1"
48+
"argocd.argoproj.io/sync-wave": "1"
4549
name: aws-infrastructure-system
4650
---
4751
# Source: cluster-api-operator/templates/addon.yaml
@@ -53,6 +57,7 @@ metadata:
5357
annotations:
5458
"helm.sh/hook": "post-install"
5559
"helm.sh/hook-weight": "2"
60+
"argocd.argoproj.io/sync-wave": "2"
5661
---
5762
# Source: cluster-api-operator/templates/infra-conditions.yaml
5863
apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -63,6 +68,7 @@ metadata:
6368
annotations:
6469
"helm.sh/hook": "post-install"
6570
"helm.sh/hook-weight": "2"
71+
"argocd.argoproj.io/sync-wave": "2"
6672
spec:
6773
configSecret:
6874
name: aws-variables
@@ -77,6 +83,7 @@ metadata:
7783
annotations:
7884
"helm.sh/hook": "post-install"
7985
"helm.sh/hook-weight": "2"
86+
"argocd.argoproj.io/sync-wave": "2"
8087
spec:
8188
configSecret:
8289
name: aws-variables
@@ -91,6 +98,7 @@ metadata:
9198
annotations:
9299
"helm.sh/hook": "post-install"
93100
"helm.sh/hook-weight": "2"
101+
"argocd.argoproj.io/sync-wave": "2"
94102
spec:
95103
version: v1.6.2
96104
manager:
@@ -110,6 +118,7 @@ metadata:
110118
annotations:
111119
"helm.sh/hook": "post-install"
112120
"helm.sh/hook-weight": "2"
121+
"argocd.argoproj.io/sync-wave": "2"
113122
spec:
114123
version: v2.4.0
115124
manager:

‎test/e2e/resources/multiple-infra-custom-ns-versions.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ metadata:
1515
annotations:
1616
"helm.sh/hook": "post-install"
1717
"helm.sh/hook-weight": "1"
18+
"argocd.argoproj.io/sync-wave": "1"
1819
name: capi-kubeadm-bootstrap-system
1920
---
2021
# Source: cluster-api-operator/templates/infra-conditions.yaml
@@ -24,6 +25,7 @@ metadata:
2425
annotations:
2526
"helm.sh/hook": "post-install"
2627
"helm.sh/hook-weight": "1"
28+
"argocd.argoproj.io/sync-wave": "1"
2729
name: capi-kubeadm-control-plane-system
2830
---
2931
# Source: cluster-api-operator/templates/infra.yaml
@@ -33,6 +35,7 @@ metadata:
3335
annotations:
3436
"helm.sh/hook": "post-install"
3537
"helm.sh/hook-weight": "1"
38+
"argocd.argoproj.io/sync-wave": "1"
3639
name: capd-custom-ns
3740
---
3841
# Source: cluster-api-operator/templates/infra.yaml
@@ -42,6 +45,7 @@ metadata:
4245
annotations:
4346
"helm.sh/hook": "post-install"
4447
"helm.sh/hook-weight": "1"
48+
"argocd.argoproj.io/sync-wave": "1"
4549
name: capz-custom-ns
4650
---
4751
# Source: cluster-api-operator/templates/infra-conditions.yaml
@@ -53,6 +57,7 @@ metadata:
5357
annotations:
5458
"helm.sh/hook": "post-install"
5559
"helm.sh/hook-weight": "2"
60+
"argocd.argoproj.io/sync-wave": "2"
5661
spec:
5762
configSecret:
5863
name: test-secret-name
@@ -67,6 +72,7 @@ metadata:
6772
annotations:
6873
"helm.sh/hook": "post-install"
6974
"helm.sh/hook-weight": "2"
75+
"argocd.argoproj.io/sync-wave": "2"
7076
spec:
7177
configSecret:
7278
name: test-secret-name
@@ -95,6 +101,7 @@ metadata:
95101
annotations:
96102
"helm.sh/hook": "post-install"
97103
"helm.sh/hook-weight": "2"
104+
"argocd.argoproj.io/sync-wave": "2"
98105
spec:
99106
version: v1.5.4
100107
configSecret:
@@ -110,6 +117,7 @@ metadata:
110117
annotations:
111118
"helm.sh/hook": "post-install"
112119
"helm.sh/hook-weight": "2"
120+
"argocd.argoproj.io/sync-wave": "2"
113121
spec:
114122
version: v1.10.0
115123
configSecret:

‎test/e2e/resources/only-addon.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
annotations:
77
"helm.sh/hook": "post-install"
88
"helm.sh/hook-weight": "1"
9+
"argocd.argoproj.io/sync-wave": "1"
910
name: helm-addon-system
1011
---
1112
# Source: cluster-api-operator/templates/core-conditions.yaml
@@ -26,6 +27,7 @@ metadata:
2627
annotations:
2728
"helm.sh/hook": "post-install"
2829
"helm.sh/hook-weight": "2"
30+
"argocd.argoproj.io/sync-wave": "2"
2931
---
3032
# Source: cluster-api-operator/templates/core-conditions.yaml
3133
apiVersion: operator.cluster.x-k8s.io/v1alpha2

0 commit comments

Comments
 (0)