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

test/e2e/ccm_helpers.go

@@ -52,6 +52,12 @@ func WaitForCCMToBeReadyInWorkloadCluster(
 			workloadClusterClient,
 			input,
 		)
+	case "nutanix":
+		WaitForNutanixCCMToBeReadyInWorkloadCluster(
+			ctx,
+			workloadClusterClient,
+			input,
+		)
 	default:
 		Fail(
 			fmt.Sprintf(
@@ -117,3 +123,59 @@ func WaitForAWSCCMToBeReadyInWorkloadCluster(
 		},
 	}, input.DaemonSetIntervals...)
 }
+
+func WaitForNutanixCCMToBeReadyInWorkloadCluster(
+	ctx context.Context,
+	workloadClusterClient client.Client,
+	input WaitForCCMToBeReadyInWorkloadClusterInput, //nolint:gocritic // This hugeParam is OK in tests.
+) {
+	switch input.CCM.Strategy {
+	case v1alpha1.AddonStrategyClusterResourceSet:
+		crs := &addonsv1.ClusterResourceSet{}
+		Expect(input.ClusterProxy.GetClient().Get(
+			ctx,
+			types.NamespacedName{
+				Name:      "nutanix-ccm-" + input.WorkloadCluster.Name,
+				Namespace: input.WorkloadCluster.Namespace,
+			},
+			crs,
+		)).To(Succeed())
+
+		framework.WaitForClusterResourceSetToApplyResources(
+			ctx,
+			framework.WaitForClusterResourceSetToApplyResourcesInput{
+				ClusterResourceSet: crs,
+				ClusterProxy:       input.ClusterProxy,
+				Cluster:            input.WorkloadCluster,
+			},
+			input.ClusterResourceSetIntervals...,
+		)
+	case v1alpha1.AddonStrategyHelmAddon:
+		WaitForHelmReleaseProxyReadyForCluster(
+			ctx,
+			WaitForHelmReleaseProxyReadyForClusterInput{
+				GetLister:          input.ClusterProxy.GetClient(),
+				Cluster:            input.WorkloadCluster,
+				HelmChartProxyName: "nutanix-ccm-" + input.WorkloadCluster.Name,
+			},
+			input.HelmReleaseIntervals...,
+		)
+	default:
+		Fail(
+			fmt.Sprintf(
+				"Do not know how to wait for AWS CCM using strategy %s to be ready",
+				input.CCM.Strategy,
+			),
+		)
+	}
+
+	WaitForDaemonSetsAvailable(ctx, WaitForDaemonSetsAvailableInput{
+		Getter: workloadClusterClient,
+		DaemonSet: &appsv1.DaemonSet{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "nutanix-cloud-controller-manager",
+				Namespace: metav1.NamespaceSystem,
+			},
+		},
+	}, input.DaemonSetIntervals...)
+}