diff --git a/hack/charts/cluster-api-operator/templates/addon.yaml b/hack/charts/cluster-api-operator/templates/addon.yaml index 9095368cd..c571b60aa 100644 --- a/hack/charts/cluster-api-operator/templates/addon.yaml +++ b/hack/charts/cluster-api-operator/templates/addon.yaml @@ -26,7 +26,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: {{ $addonNamespace }} @@ -37,7 +37,7 @@ metadata: name: {{ $addonName }} namespace: {{ $addonNamespace }} annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" {{- if or $addonVersion $.Values.secretName }} diff --git a/hack/charts/cluster-api-operator/templates/bootstrap.yaml b/hack/charts/cluster-api-operator/templates/bootstrap.yaml index a1634ee89..69a930f2a 100644 --- a/hack/charts/cluster-api-operator/templates/bootstrap.yaml +++ b/hack/charts/cluster-api-operator/templates/bootstrap.yaml @@ -26,7 +26,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: {{ $bootstrapNamespace }} --- @@ -36,7 +36,7 @@ metadata: name: {{ $bootstrapName }} namespace: {{ $bootstrapNamespace }} annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" {{- if or $bootstrapVersion $.Values.configSecret.name }} spec: diff --git a/hack/charts/cluster-api-operator/templates/control-plane.yaml b/hack/charts/cluster-api-operator/templates/control-plane.yaml index b7cec76d5..d48e0c269 100644 --- a/hack/charts/cluster-api-operator/templates/control-plane.yaml +++ b/hack/charts/cluster-api-operator/templates/control-plane.yaml @@ -26,7 +26,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: {{ $controlPlaneNamespace }} --- @@ -36,7 +36,7 @@ metadata: name: {{ $controlPlaneName }} namespace: {{ $controlPlaneNamespace }} annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" {{- if or $controlPlaneVersion $.Values.configSecret.name }} spec: diff --git a/hack/charts/cluster-api-operator/templates/core-conditions.yaml b/hack/charts/cluster-api-operator/templates/core-conditions.yaml index 7bba5953f..bb396a24b 100644 --- a/hack/charts/cluster-api-operator/templates/core-conditions.yaml +++ b/hack/charts/cluster-api-operator/templates/core-conditions.yaml @@ -6,7 +6,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -16,7 +16,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" {{- with .Values.configSecret }} spec: diff --git a/hack/charts/cluster-api-operator/templates/core.yaml b/hack/charts/cluster-api-operator/templates/core.yaml index 013a2ef0b..2d0d8b76c 100644 --- a/hack/charts/cluster-api-operator/templates/core.yaml +++ b/hack/charts/cluster-api-operator/templates/core.yaml @@ -25,7 +25,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: {{ $coreNamespace }} --- @@ -35,7 +35,7 @@ metadata: name: {{ $coreName }} namespace: {{ $coreNamespace }} annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" {{- if or $coreVersion $.Values.configSecret.name }} diff --git a/hack/charts/cluster-api-operator/templates/infra-conditions.yaml b/hack/charts/cluster-api-operator/templates/infra-conditions.yaml index 3c3a8a753..cede0bbc6 100644 --- a/hack/charts/cluster-api-operator/templates/infra-conditions.yaml +++ b/hack/charts/cluster-api-operator/templates/infra-conditions.yaml @@ -7,7 +7,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-bootstrap-system @@ -18,7 +18,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" {{- with .Values.configSecret }} @@ -37,7 +37,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-control-plane-system @@ -48,7 +48,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" {{- with .Values.configSecret }} diff --git a/hack/charts/cluster-api-operator/templates/infra.yaml b/hack/charts/cluster-api-operator/templates/infra.yaml index 4b4621e21..269bffd13 100644 --- a/hack/charts/cluster-api-operator/templates/infra.yaml +++ b/hack/charts/cluster-api-operator/templates/infra.yaml @@ -26,7 +26,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: {{ $infrastructureNamespace }} @@ -37,7 +37,7 @@ metadata: name: {{ $infrastructureName }} namespace: {{ $infrastructureNamespace }} annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" {{- if or $infrastructureVersion $.Values.configSecret.name $.Values.manager $.Values.additionalDeployments }} diff --git a/test/e2e/resources/all-providers-custom-ns-versions.yaml b/test/e2e/resources/all-providers-custom-ns-versions.yaml index cab28eb1e..eb1346c2c 100644 --- a/test/e2e/resources/all-providers-custom-ns-versions.yaml +++ b/test/e2e/resources/all-providers-custom-ns-versions.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-custom-ns @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-bootstrap-custom-ns --- @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-control-plane-custom-ns --- @@ -32,7 +32,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-custom-ns --- @@ -41,7 +41,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capd-custom-ns @@ -53,7 +53,7 @@ metadata: name: helm namespace: helm-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -66,7 +66,7 @@ metadata: name: kubeadm namespace: kubeadm-bootstrap-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v1.5.4 @@ -81,7 +81,7 @@ metadata: name: kubeadm namespace: kubeadm-control-plane-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v1.5.4 @@ -96,7 +96,7 @@ metadata: name: cluster-api namespace: capi-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -112,7 +112,7 @@ metadata: name: docker namespace: capd-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/all-providers-custom-versions.yaml b/test/e2e/resources/all-providers-custom-versions.yaml index 4f791637c..aafa04336 100644 --- a/test/e2e/resources/all-providers-custom-versions.yaml +++ b/test/e2e/resources/all-providers-custom-versions.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-addon-system @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-bootstrap-system --- @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-control-plane-system --- @@ -32,7 +32,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -41,7 +41,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: docker-infrastructure-system @@ -53,7 +53,7 @@ metadata: name: helm namespace: helm-addon-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -66,7 +66,7 @@ metadata: name: kubeadm namespace: kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v1.5.4 @@ -81,7 +81,7 @@ metadata: name: kubeadm namespace: kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v1.5.4 @@ -96,7 +96,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -112,7 +112,7 @@ metadata: name: docker namespace: docker-infrastructure-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/all-providers-latest-versions.yaml b/test/e2e/resources/all-providers-latest-versions.yaml index 80b59ec56..8a4b9855b 100644 --- a/test/e2e/resources/all-providers-latest-versions.yaml +++ b/test/e2e/resources/all-providers-latest-versions.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-addon-system @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-bootstrap-system --- @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-control-plane-system --- @@ -32,7 +32,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -41,7 +41,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: docker-infrastructure-system @@ -53,7 +53,7 @@ metadata: name: helm namespace: helm-addon-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" --- @@ -64,7 +64,7 @@ metadata: name: kubeadm namespace: kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -78,7 +78,7 @@ metadata: name: kubeadm namespace: kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -92,7 +92,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -107,7 +107,7 @@ metadata: name: docker namespace: docker-infrastructure-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/feature-gates.yaml b/test/e2e/resources/feature-gates.yaml index e356795d1..52cba73c6 100644 --- a/test/e2e/resources/feature-gates.yaml +++ b/test/e2e/resources/feature-gates.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-addon-system @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-bootstrap-system @@ -33,7 +33,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-control-plane-system @@ -43,7 +43,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: aws-infrastructure-system @@ -55,7 +55,7 @@ metadata: name: helm namespace: helm-addon-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" --- @@ -66,7 +66,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -81,7 +81,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -96,7 +96,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -116,7 +116,7 @@ metadata: name: aws namespace: aws-infrastructure-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/manager-defined-missing-other-infra-spec.yaml b/test/e2e/resources/manager-defined-missing-other-infra-spec.yaml index d6d37ad64..c80b220ba 100644 --- a/test/e2e/resources/manager-defined-missing-other-infra-spec.yaml +++ b/test/e2e/resources/manager-defined-missing-other-infra-spec.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-addon-system @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-bootstrap-system --- @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-control-plane-system --- @@ -32,7 +32,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -41,7 +41,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: docker-infrastructure-system @@ -53,7 +53,7 @@ metadata: name: helm namespace: helm-addon-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" --- @@ -64,7 +64,7 @@ metadata: name: kubeadm namespace: kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -78,7 +78,7 @@ metadata: name: kubeadm namespace: kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -92,7 +92,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -107,7 +107,7 @@ metadata: name: docker namespace: docker-infrastructure-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/multiple-bootstrap-custom-ns-versions.yaml b/test/e2e/resources/multiple-bootstrap-custom-ns-versions.yaml index eedc837fe..11f237b5d 100644 --- a/test/e2e/resources/multiple-bootstrap-custom-ns-versions.yaml +++ b/test/e2e/resources/multiple-bootstrap-custom-ns-versions.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-bootstrap-custom-ns --- @@ -13,7 +13,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: rke2-bootstrap-custom-ns --- @@ -22,7 +22,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -33,7 +33,7 @@ metadata: name: kubeadm namespace: kubeadm-bootstrap-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v1.5.4 @@ -48,7 +48,7 @@ metadata: name: rke2 namespace: rke2-bootstrap-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v0.3.0 @@ -63,7 +63,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: diff --git a/test/e2e/resources/multiple-control-plane-custom-ns-versions.yaml b/test/e2e/resources/multiple-control-plane-custom-ns-versions.yaml index 0c9121721..70e568ede 100644 --- a/test/e2e/resources/multiple-control-plane-custom-ns-versions.yaml +++ b/test/e2e/resources/multiple-control-plane-custom-ns-versions.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-control-plane-custom-ns --- @@ -13,7 +13,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: rke2-control-plane-custom-ns --- @@ -22,7 +22,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -33,7 +33,7 @@ metadata: name: kubeadm namespace: kubeadm-control-plane-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v1.5.4 @@ -48,7 +48,7 @@ metadata: name: rke2 namespace: rke2-control-plane-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: version: v0.3.0 @@ -63,7 +63,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: diff --git a/test/e2e/resources/multiple-infra-custom-ns-versions.yaml b/test/e2e/resources/multiple-infra-custom-ns-versions.yaml index e0ba973ef..f43d05f80 100644 --- a/test/e2e/resources/multiple-infra-custom-ns-versions.yaml +++ b/test/e2e/resources/multiple-infra-custom-ns-versions.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -13,7 +13,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-bootstrap-system @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-control-plane-system @@ -33,7 +33,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capd-custom-ns @@ -43,7 +43,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capz-custom-ns @@ -55,7 +55,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -70,7 +70,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -85,7 +85,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -99,7 +99,7 @@ metadata: name: docker namespace: capd-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -115,7 +115,7 @@ metadata: name: azure namespace: capz-custom-ns annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/only-addon.yaml b/test/e2e/resources/only-addon.yaml index e00af6526..f454f85c7 100644 --- a/test/e2e/resources/only-addon.yaml +++ b/test/e2e/resources/only-addon.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-addon-system @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -25,7 +25,7 @@ metadata: name: helm namespace: helm-addon-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" --- @@ -36,7 +36,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: diff --git a/test/e2e/resources/only-bootstrap.yaml b/test/e2e/resources/only-bootstrap.yaml index fd45b97c5..da8669907 100644 --- a/test/e2e/resources/only-bootstrap.yaml +++ b/test/e2e/resources/only-bootstrap.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-bootstrap-system --- @@ -13,7 +13,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -24,7 +24,7 @@ metadata: name: kubeadm namespace: kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -38,7 +38,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: diff --git a/test/e2e/resources/only-control-plane.yaml b/test/e2e/resources/only-control-plane.yaml index ad58a2e40..a1857dfa0 100644 --- a/test/e2e/resources/only-control-plane.yaml +++ b/test/e2e/resources/only-control-plane.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: kubeadm-control-plane-system --- @@ -13,7 +13,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -24,7 +24,7 @@ metadata: name: kubeadm namespace: kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -38,7 +38,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: diff --git a/test/e2e/resources/only-infra-and-addon.yaml b/test/e2e/resources/only-infra-and-addon.yaml index 374fa083f..35dfda682 100644 --- a/test/e2e/resources/only-infra-and-addon.yaml +++ b/test/e2e/resources/only-infra-and-addon.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: helm-addon-system @@ -14,7 +14,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-bootstrap-system @@ -33,7 +33,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-control-plane-system @@ -43,7 +43,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: docker-infrastructure-system @@ -55,7 +55,7 @@ metadata: name: helm namespace: helm-addon-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" --- @@ -66,7 +66,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -81,7 +81,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -96,7 +96,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -110,7 +110,7 @@ metadata: name: docker namespace: docker-infrastructure-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: diff --git a/test/e2e/resources/only-infra.yaml b/test/e2e/resources/only-infra.yaml index 8146c7d95..6f91ddfbb 100644 --- a/test/e2e/resources/only-infra.yaml +++ b/test/e2e/resources/only-infra.yaml @@ -4,7 +4,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" name: capi-system --- @@ -13,7 +13,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-bootstrap-system @@ -23,7 +23,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: capi-kubeadm-control-plane-system @@ -33,7 +33,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "1" "argocd.argoproj.io/sync-wave": "1" name: docker-infrastructure-system @@ -45,7 +45,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-bootstrap-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -60,7 +60,7 @@ metadata: name: kubeadm namespace: capi-kubeadm-control-plane-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: @@ -75,7 +75,7 @@ metadata: name: cluster-api namespace: capi-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" spec: configSecret: @@ -89,7 +89,7 @@ metadata: name: docker namespace: docker-infrastructure-system annotations: - "helm.sh/hook": "post-install" + "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "2" "argocd.argoproj.io/sync-wave": "2" spec: