Merge pull request #1781 from rancher/gha-backportpr-18033324291-1

[backport-release-0.24] Add helm policy keep to installed providers

Author: alexander-demicev

.github/workflows/test_chart.yaml

@@ -103,9 +103,19 @@ jobs:
       - name: Wait for RKE2 control plane provider rollout
         run: sleep 30 && kubectl rollout status deployment rke2-control-plane-controller-manager -n rke2-control-plane-system --timeout=10m
 
+      - name: Wait for CAAPF provider rollout
+        run: sleep 30 && kubectl rollout status deployment caapf-controller-manager -n rancher-turtles-system --timeout=10m
+
       - name: Run chart-testing (un-install)
         run: helm uninstall rancher-turtles -n rancher-turtles-system --cascade foreground --wait --debug --timeout=10m
 
+      - name: Verify CAPIProvider CRs persist after uninstall
+        run: |
+          set -euo pipefail
+          kubectl get capiprovider rke2-bootstrap -n rke2-bootstrap-system
+          kubectl get capiprovider rke2-control-plane -n rke2-control-plane-system
+          kubectl get capiprovider fleet -n rancher-turtles-system
+
       - name: Run chart re-install
         run: helm install rancher-turtles out/charts/rancher-turtles/ -n rancher-turtles-system --create-namespace --wait --debug
 

charts/rancher-turtles/templates/addon-provider-fleet.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "2"
+    "helm.sh/resource-policy": keep
 spec:
   enableAutomaticUpdate: true
   type: addon
@@ -21,6 +22,7 @@ metadata:
   annotations:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "2"
+    "helm.sh/resource-policy": keep
 data:
   manifests: |-
     apiVersion: addons.cluster.x-k8s.io/v1alpha1

charts/rancher-turtles/templates/pre-delete-job.yaml

@@ -59,9 +59,11 @@ spec:
           image: {{ index .Values "rancherTurtles" "kubectlImage" }}
           args:
           - delete
-          - capiproviders
-          - -A
-          - --all
+          - capiprovider
+          - cluster-api
+          - -n
+          - {{ index .Values "cluster-api-operator" "cluster-api" "core" "namespace" }}
+          - --ignore-not-found=true
           - --cascade=foreground
       restartPolicy: Never
 {{- end }}

charts/rancher-turtles/templates/rke2-bootstrap.yaml

@@ -8,6 +8,7 @@ metadata:
   annotations:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "1"
+    "helm.sh/resource-policy": keep
   name: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "namespace" }}
 {{- end }}
 ---
@@ -19,6 +20,7 @@ metadata:
   annotations:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "2"
+    "helm.sh/resource-policy": keep
 spec:
   name: rke2
   type: bootstrap

charts/rancher-turtles/templates/rke2-controlplane.yaml

@@ -8,6 +8,7 @@ metadata:
   annotations:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "1"
+    "helm.sh/resource-policy": keep
   name: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "namespace" }}
 {{- end }}
 ---
@@ -19,6 +20,7 @@ metadata:
   annotations:
     "helm.sh/hook": "post-install, post-upgrade"
     "helm.sh/hook-weight": "2"
+    "helm.sh/resource-policy": keep
 spec:
   name: rke2
   type: controlPlane