Skip to content

Commit 06598ad

Browse files
nightguideSergey Ptushkin
nightguide
authored and
Sergey Ptushkin
committed
Add additional hook post-upgrade
1 parent 771e8a3 commit 06598ad

20 files changed

+118
-118
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apiVersion: v1
2626
kind: Namespace
2727
metadata:
2828
annotations:
29-
"helm.sh/hook": "post-install"
29+
"helm.sh/hook": "post-install,post-upgrade"
3030
"helm.sh/hook-weight": "1"
3131
"argocd.argoproj.io/sync-wave": "1"
3232
name: {{ $addonNamespace }}
@@ -37,7 +37,7 @@ metadata:
3737
name: {{ $addonName }}
3838
namespace: {{ $addonNamespace }}
3939
annotations:
40-
"helm.sh/hook": "post-install"
40+
"helm.sh/hook": "post-install,post-upgrade"
4141
"helm.sh/hook-weight": "2"
4242
"argocd.argoproj.io/sync-wave": "2"
4343
{{- if or $addonVersion $.Values.secretName }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apiVersion: v1
2626
kind: Namespace
2727
metadata:
2828
annotations:
29-
"helm.sh/hook": "post-install"
29+
"helm.sh/hook": "post-install,post-upgrade"
3030
"helm.sh/hook-weight": "1"
3131
name: {{ $bootstrapNamespace }}
3232
---
@@ -36,7 +36,7 @@ metadata:
3636
name: {{ $bootstrapName }}
3737
namespace: {{ $bootstrapNamespace }}
3838
annotations:
39-
"helm.sh/hook": "post-install"
39+
"helm.sh/hook": "post-install,post-upgrade"
4040
"helm.sh/hook-weight": "2"
4141
{{- if or $bootstrapVersion $.Values.configSecret.name }}
4242
spec:

‎hack/charts/cluster-api-operator/templates/control-plane.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apiVersion: v1
2626
kind: Namespace
2727
metadata:
2828
annotations:
29-
"helm.sh/hook": "post-install"
29+
"helm.sh/hook": "post-install,post-upgrade"
3030
"helm.sh/hook-weight": "1"
3131
name: {{ $controlPlaneNamespace }}
3232
---
@@ -36,7 +36,7 @@ metadata:
3636
name: {{ $controlPlaneName }}
3737
namespace: {{ $controlPlaneNamespace }}
3838
annotations:
39-
"helm.sh/hook": "post-install"
39+
"helm.sh/hook": "post-install,post-upgrade"
4040
"helm.sh/hook-weight": "2"
4141
{{- if or $controlPlaneVersion $.Values.configSecret.name }}
4242
spec:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apiVersion: v1
66
kind: Namespace
77
metadata:
88
annotations:
9-
"helm.sh/hook": "post-install"
9+
"helm.sh/hook": "post-install,post-upgrade"
1010
"helm.sh/hook-weight": "1"
1111
name: capi-system
1212
---
@@ -16,7 +16,7 @@ metadata:
1616
name: cluster-api
1717
namespace: capi-system
1818
annotations:
19-
"helm.sh/hook": "post-install"
19+
"helm.sh/hook": "post-install,post-upgrade"
2020
"helm.sh/hook-weight": "2"
2121
{{- with .Values.configSecret }}
2222
spec:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apiVersion: v1
2525
kind: Namespace
2626
metadata:
2727
annotations:
28-
"helm.sh/hook": "post-install"
28+
"helm.sh/hook": "post-install,post-upgrade"
2929
"helm.sh/hook-weight": "1"
3030
name: {{ $coreNamespace }}
3131
---
@@ -35,7 +35,7 @@ metadata:
3535
name: {{ $coreName }}
3636
namespace: {{ $coreNamespace }}
3737
annotations:
38-
"helm.sh/hook": "post-install"
38+
"helm.sh/hook": "post-install,post-upgrade"
3939
"helm.sh/hook-weight": "2"
4040
"argocd.argoproj.io/sync-wave": "2"
4141
{{- if or $coreVersion $.Values.configSecret.name }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apiVersion: v1
77
kind: Namespace
88
metadata:
99
annotations:
10-
"helm.sh/hook": "post-install"
10+
"helm.sh/hook": "post-install,post-upgrade"
1111
"helm.sh/hook-weight": "1"
1212
"argocd.argoproj.io/sync-wave": "1"
1313
name: capi-kubeadm-bootstrap-system
@@ -18,7 +18,7 @@ metadata:
1818
name: kubeadm
1919
namespace: capi-kubeadm-bootstrap-system
2020
annotations:
21-
"helm.sh/hook": "post-install"
21+
"helm.sh/hook": "post-install,post-upgrade"
2222
"helm.sh/hook-weight": "2"
2323
"argocd.argoproj.io/sync-wave": "2"
2424
{{- with .Values.configSecret }}
@@ -37,7 +37,7 @@ apiVersion: v1
3737
kind: Namespace
3838
metadata:
3939
annotations:
40-
"helm.sh/hook": "post-install"
40+
"helm.sh/hook": "post-install,post-upgrade"
4141
"helm.sh/hook-weight": "1"
4242
"argocd.argoproj.io/sync-wave": "1"
4343
name: capi-kubeadm-control-plane-system
@@ -48,7 +48,7 @@ metadata:
4848
name: kubeadm
4949
namespace: capi-kubeadm-control-plane-system
5050
annotations:
51-
"helm.sh/hook": "post-install"
51+
"helm.sh/hook": "post-install,post-upgrade"
5252
"helm.sh/hook-weight": "2"
5353
"argocd.argoproj.io/sync-wave": "2"
5454
{{- with .Values.configSecret }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ apiVersion: v1
3636
kind: Namespace
3737
metadata:
3838
annotations:
39-
"helm.sh/hook": "post-install"
39+
"helm.sh/hook": "post-install,post-upgrade"
4040
"helm.sh/hook-weight": "1"
4141
"argocd.argoproj.io/sync-wave": "1"
4242
name: {{ $infrastructureNamespace }}
@@ -47,7 +47,7 @@ metadata:
4747
name: {{ $infrastructureName }}
4848
namespace: {{ $infrastructureNamespace }}
4949
annotations:
50-
"helm.sh/hook": "post-install"
50+
"helm.sh/hook": "post-install,post-upgrade"
5151
"helm.sh/hook-weight": "2"
5252
"argocd.argoproj.io/sync-wave": "2"
5353
{{- if or $infrastructureVersion $.Values.configSecret.name $.Values.manager $.Values.additionalDeployments }}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Namespace
55
metadata:
66
annotations:
7-
"helm.sh/hook": "post-install"
7+
"helm.sh/hook": "post-install,post-upgrade"
88
"helm.sh/hook-weight": "1"
99
"argocd.argoproj.io/sync-wave": "1"
1010
name: helm-custom-ns
@@ -14,7 +14,7 @@ apiVersion: v1
1414
kind: Namespace
1515
metadata:
1616
annotations:
17-
"helm.sh/hook": "post-install"
17+
"helm.sh/hook": "post-install,post-upgrade"
1818
"helm.sh/hook-weight": "1"
1919
name: kubeadm-bootstrap-custom-ns
2020
---
@@ -23,7 +23,7 @@ apiVersion: v1
2323
kind: Namespace
2424
metadata:
2525
annotations:
26-
"helm.sh/hook": "post-install"
26+
"helm.sh/hook": "post-install,post-upgrade"
2727
"helm.sh/hook-weight": "1"
2828
name: kubeadm-control-plane-custom-ns
2929
---
@@ -32,7 +32,7 @@ apiVersion: v1
3232
kind: Namespace
3333
metadata:
3434
annotations:
35-
"helm.sh/hook": "post-install"
35+
"helm.sh/hook": "post-install,post-upgrade"
3636
"helm.sh/hook-weight": "1"
3737
name: capi-custom-ns
3838
---
@@ -41,7 +41,7 @@ apiVersion: v1
4141
kind: Namespace
4242
metadata:
4343
annotations:
44-
"helm.sh/hook": "post-install"
44+
"helm.sh/hook": "post-install,post-upgrade"
4545
"helm.sh/hook-weight": "1"
4646
"argocd.argoproj.io/sync-wave": "1"
4747
name: capd-custom-ns
@@ -53,7 +53,7 @@ metadata:
5353
name: helm
5454
namespace: helm-custom-ns
5555
annotations:
56-
"helm.sh/hook": "post-install"
56+
"helm.sh/hook": "post-install,post-upgrade"
5757
"helm.sh/hook-weight": "2"
5858
"argocd.argoproj.io/sync-wave": "2"
5959
spec:
@@ -66,7 +66,7 @@ metadata:
6666
name: kubeadm
6767
namespace: kubeadm-bootstrap-custom-ns
6868
annotations:
69-
"helm.sh/hook": "post-install"
69+
"helm.sh/hook": "post-install,post-upgrade"
7070
"helm.sh/hook-weight": "2"
7171
spec:
7272
version: v1.5.4
@@ -81,7 +81,7 @@ metadata:
8181
name: kubeadm
8282
namespace: kubeadm-control-plane-custom-ns
8383
annotations:
84-
"helm.sh/hook": "post-install"
84+
"helm.sh/hook": "post-install,post-upgrade"
8585
"helm.sh/hook-weight": "2"
8686
spec:
8787
version: v1.5.4
@@ -96,7 +96,7 @@ metadata:
9696
name: cluster-api
9797
namespace: capi-custom-ns
9898
annotations:
99-
"helm.sh/hook": "post-install"
99+
"helm.sh/hook": "post-install,post-upgrade"
100100
"helm.sh/hook-weight": "2"
101101
"argocd.argoproj.io/sync-wave": "2"
102102
spec:
@@ -112,7 +112,7 @@ metadata:
112112
name: docker
113113
namespace: capd-custom-ns
114114
annotations:
115-
"helm.sh/hook": "post-install"
115+
"helm.sh/hook": "post-install,post-upgrade"
116116
"helm.sh/hook-weight": "2"
117117
"argocd.argoproj.io/sync-wave": "2"
118118
spec:

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Namespace
55
metadata:
66
annotations:
7-
"helm.sh/hook": "post-install"
7+
"helm.sh/hook": "post-install,post-upgrade"
88
"helm.sh/hook-weight": "1"
99
"argocd.argoproj.io/sync-wave": "1"
1010
name: helm-addon-system
@@ -14,7 +14,7 @@ apiVersion: v1
1414
kind: Namespace
1515
metadata:
1616
annotations:
17-
"helm.sh/hook": "post-install"
17+
"helm.sh/hook": "post-install,post-upgrade"
1818
"helm.sh/hook-weight": "1"
1919
name: kubeadm-bootstrap-system
2020
---
@@ -23,7 +23,7 @@ apiVersion: v1
2323
kind: Namespace
2424
metadata:
2525
annotations:
26-
"helm.sh/hook": "post-install"
26+
"helm.sh/hook": "post-install,post-upgrade"
2727
"helm.sh/hook-weight": "1"
2828
name: kubeadm-control-plane-system
2929
---
@@ -32,7 +32,7 @@ apiVersion: v1
3232
kind: Namespace
3333
metadata:
3434
annotations:
35-
"helm.sh/hook": "post-install"
35+
"helm.sh/hook": "post-install,post-upgrade"
3636
"helm.sh/hook-weight": "1"
3737
name: capi-system
3838
---
@@ -41,7 +41,7 @@ apiVersion: v1
4141
kind: Namespace
4242
metadata:
4343
annotations:
44-
"helm.sh/hook": "post-install"
44+
"helm.sh/hook": "post-install,post-upgrade"
4545
"helm.sh/hook-weight": "1"
4646
"argocd.argoproj.io/sync-wave": "1"
4747
name: docker-infrastructure-system
@@ -53,7 +53,7 @@ metadata:
5353
name: helm
5454
namespace: helm-addon-system
5555
annotations:
56-
"helm.sh/hook": "post-install"
56+
"helm.sh/hook": "post-install,post-upgrade"
5757
"helm.sh/hook-weight": "2"
5858
"argocd.argoproj.io/sync-wave": "2"
5959
spec:
@@ -66,7 +66,7 @@ metadata:
6666
name: kubeadm
6767
namespace: kubeadm-bootstrap-system
6868
annotations:
69-
"helm.sh/hook": "post-install"
69+
"helm.sh/hook": "post-install,post-upgrade"
7070
"helm.sh/hook-weight": "2"
7171
spec:
7272
version: v1.5.4
@@ -81,7 +81,7 @@ metadata:
8181
name: kubeadm
8282
namespace: kubeadm-control-plane-system
8383
annotations:
84-
"helm.sh/hook": "post-install"
84+
"helm.sh/hook": "post-install,post-upgrade"
8585
"helm.sh/hook-weight": "2"
8686
spec:
8787
version: v1.5.4
@@ -96,7 +96,7 @@ metadata:
9696
name: cluster-api
9797
namespace: capi-system
9898
annotations:
99-
"helm.sh/hook": "post-install"
99+
"helm.sh/hook": "post-install,post-upgrade"
100100
"helm.sh/hook-weight": "2"
101101
"argocd.argoproj.io/sync-wave": "2"
102102
spec:
@@ -112,7 +112,7 @@ metadata:
112112
name: docker
113113
namespace: docker-infrastructure-system
114114
annotations:
115-
"helm.sh/hook": "post-install"
115+
"helm.sh/hook": "post-install,post-upgrade"
116116
"helm.sh/hook-weight": "2"
117117
"argocd.argoproj.io/sync-wave": "2"
118118
spec:

0 commit comments

Comments
 (0)