Update ccm_helpers and fix overlay templates for nutanix

Author: thunderboltsid

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

@@ -67,7 +67,7 @@ spec:
             credentials:
               secretRef:
                 name: ${CLUSTER_NAME}-pc-creds
-            strategy: HelmAddon
+            strategy: ClusterResourceSet
           clusterAutoscaler:
             strategy: ClusterResourceSet
           cni:

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

@@ -67,7 +67,7 @@ spec:
             credentials:
               secretRef:
                 name: ${CLUSTER_NAME}-pc-creds
-            strategy: HelmAddon
+            strategy: ClusterResourceSet
           clusterAutoscaler:
             strategy: ClusterResourceSet
           cni:

hack/examples/overlays/clusters/nutanix/calico/crs/kustomization.yaml.tmpl

@@ -17,3 +17,6 @@ patches:
   - target:
       kind: Cluster
     path: ../../../../../patches/crs-strategy.yaml
+  - target:
+      kind: Cluster
+    path: ../../../../../patches/nutanix/ccm-crs-strategy.yaml

hack/examples/overlays/clusters/nutanix/calico/helm-addon/kustomization.yaml.tmpl

@@ -17,3 +17,6 @@ patches:
   - target:
       kind: Cluster
     path: ../../../../../patches/helm-addon-strategy.yaml
+  - target:
+      kind: Cluster
+    path: ../../../../../patches/nutanix/ccm-helm-addon-strategy.yaml

hack/examples/overlays/clusters/nutanix/cilium/crs/kustomization.yaml.tmpl

@@ -17,3 +17,6 @@ patches:
   - target:
       kind: Cluster
     path: ../../../../../patches/crs-strategy.yaml
+  - target:
+      kind: Cluster
+    path: ../../../../../patches/nutanix/ccm-crs-strategy.yaml

hack/examples/overlays/clusters/nutanix/cilium/helm-addon/kustomization.yaml.tmpl

@@ -17,3 +17,6 @@ patches:
   - target:
       kind: Cluster
     path: ../../../../../patches/helm-addon-strategy.yaml
+  - target:
+      kind: Cluster
+    path: ../../../../../patches/nutanix/ccm-helm-addon-strategy.yaml

hack/examples/patches/nutanix/ccm-crs-strategy.yaml

@@ -0,0 +1,6 @@
+# Copyright 2024 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+- op: "add"
+  path: "/spec/topology/variables/0/value/addons/ccm/strategy"
+  value: ClusterResourceSet

hack/examples/patches/nutanix/ccm-helm-addon-strategy.yaml

@@ -0,0 +1,6 @@
+# Copyright 2024 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+- op: "add"
+  path: "/spec/topology/variables/0/value/addons/ccm/strategy"
+  value: HelmAddon

hack/examples/patches/nutanix/ccm.yaml

@@ -4,7 +4,6 @@
 - op: "add"
   path: "/spec/topology/variables/0/value/addons/ccm"
   value:
-    strategy: HelmAddon
     credentials:
       secretRef:
         name: ${CLUSTER_NAME}-pc-creds