fix: Add strategy to Nutanix CCM addon in examples

Missed in previous PR when this ws refactored for AWS CCM. This
was not found in the PR checks because we still do not have CI
running on Nutanix infrastructure - but that is coming soon!

Author: jimmidyson

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

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

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

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

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

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

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

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

hack/addons/kustomize/nutanix-ccm/kustomization.yaml.tmpl

@@ -13,6 +13,5 @@ helmCharts:
   repo: https://nutanix.github.io/helm/
   releaseName: nutanix-ccm
   version: ${NUTANIX_CCM_CHART_VERSION}
-  valuesFile: helm-values.yaml
   includeCRDs: true
   skipTests: true

hack/examples/patches/nutanix/ccm.yaml

@@ -7,3 +7,4 @@
     credentials:
       secretRef:
         name: ${CLUSTER_NAME}-pc-creds
+    strategy: HelmAddon

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,39 @@ 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.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 Nutanix CCM using strategy %s to be ready",
+				input.CCM.Strategy,
+			),
+		)
+	}
+
+	WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{
+		Getter: workloadClusterClient,
+		Deployment: &appsv1.Deployment{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "nutanix-cloud-controller-manager",
+				Namespace: metav1.NamespaceSystem,
+			},
+		},
+	}, input.DeploymentIntervals...)
+}