ci: Address review comments

Author: thunderboltsid

.github/workflows/e2e.yml

@@ -84,7 +84,7 @@ jobs:
             ${{ runner.os }}-go-
 
       - name: Run e2e tests
-        run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }} && cni:Cilium && addonStrategy:HelmAddon' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}'
+        run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}

api/v1alpha1/zz_generated.deepcopy.go

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

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

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

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

@@ -17,6 +17,3 @@ 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/crs/kustomization.yaml.tmpl

@@ -17,6 +17,3 @@ 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/calico/helm-addon/kustomization.yaml.tmpl

@@ -17,6 +17,3 @@ 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/crs/kustomization.yaml.tmpl

@@ -17,6 +17,3 @@ 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/helm-addon/kustomization.yaml.tmpl

@@ -196,7 +196,7 @@ variables:
   # IP/FQDN of Prism Central.
   # NOTE: This has to be overridden by specifying the env var NUTANIX_ENDPOINT when running the e2e tests. It is
   # set as empty here to enable running the e2e tests for non-nutanix providers locally without setting the env var.
-  #  NUTANIX_ENDPOINT: ""
+  NUTANIX_ENDPOINT: ""
   # # Port of Prism Central. Default: 9440
   # NUTANIX_PORT: 9440
   # # Disable Prism Central certificate checking. Default: false