refactor: Tidy up Nutanix CSI with consistent apply strategy (#733)

Move the current logic out to a helm addon strategy as done in other
providers.

Also move Helm release to kube-system to be consistent with other CSI
providers.

And tidy up flag names to use `--csi.nutanix.` prefix for flags,
including wiring
up to Helm chart values and deployment.

Finally, add e2e test for CSI deployment in Nutanix infra.

Depends on #732.

---------

Co-authored-by: Dimitri Koshkin <[email protected]>

Author: jimmidyson

charts/cluster-api-runtime-extensions-nutanix/templates/deployment.yaml

@@ -36,8 +36,9 @@ spec:
         - --helm-addons-configmap={{ .Values.helmAddonsConfigMap }}
         - --cni.cilium.helm-addon.default-values-template-configmap-name={{ .Values.hooks.cni.cilium.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
         - --nfd.helm-addon.default-values-template-configmap-name={{ .Values.hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
-        - --csi.local-path.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
         - --csi.aws-ebs.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "aws-ebs").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
+        - --csi.nutanix.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "nutanix").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
+        - --csi.local-path.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
         {{- range $key, $value := .Values.extraArgs }}
         - --{{ $key }}={{ $value }}
         {{- end }}

hack/addons/kustomize/nutanix-snapshot-csi/kustomization.yaml.tmpl

@@ -16,4 +16,3 @@ helmCharts:
   version: ${NUTANIX_SNAPSHOT_CSI_CHART_VERSION}
   includeCRDs: true
   skipTests: true
-  namespace: nutanix-system

hack/addons/kustomize/nutanix-storage-csi/kustomization.yaml.tmpl

@@ -14,7 +14,5 @@ helmCharts:
   repo: https://nutanix.github.io/helm-releases/
   releaseName: nutanix-csi-storage
   version: ${NUTANIX_STORAGE_CSI_CHART_VERSION}
-  valuesFile: helm-values.yaml
   includeCRDs: true
   skipTests: true
-  namespace: nutanix-system

pkg/handlers/generic/lifecycle/csi/awsebs/handler.go

@@ -92,7 +92,7 @@ func (a *AWSEBS) Apply(
 			client: a.client,
 		}
 	default:
-		return fmt.Errorf("strategy %s not implemented", strategy)
+		return fmt.Errorf("strategy %s not implemented", provider.Strategy)
 	}
 
 	if err := strategy.apply(ctx, cluster, a.config.DefaultsNamespace(), log); err != nil {

pkg/handlers/generic/lifecycle/csi/localpath/handler.go

@@ -87,7 +87,7 @@ func (l *LocalPathProvisionerCSI) Apply(
 			client: l.client,
 		}
 	default:
-		return fmt.Errorf("strategy %s not implemented", strategy)
+		return fmt.Errorf("strategy %s not implemented", provider.Strategy)
 	}
 
 	if err := strategy.apply(ctx, cluster, l.config.DefaultsNamespace(), log); err != nil {