Skip to content

Commit 281730b

Browse files
committed
refactor: Tidy up Nutanix CSI with consistent apply strategy
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.
1 parent e13a616 commit 281730b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ spec:
3636
- --csi.aws-ebs.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "aws-ebs").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
3737
- --csi.nutanix.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "nutanix").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
3838
- --csi.local-path.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
39-
- --csi.aws-ebs.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "aws-ebs").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
4039
{{- range $key, $value := .Values.extraArgs }}
4140
- --{{ $key }}={{ $value }}
4241
{{- end }}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kind: Kustomization
77
metadata:
88
name: nutanix-csi-kustomize
99

10-
namespace: kube-system
10+
namespace: ntnx-system
1111

1212
helmCharts:
1313
- name: nutanix-csi-snapshot
@@ -16,3 +16,4 @@ helmCharts:
1616
version: ${NUTANIX_SNAPSHOT_CSI_CHART_VERSION}
1717
includeCRDs: true
1818
skipTests: true
19+
namespace: ntnx-system

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kind: Kustomization
77
metadata:
88
name: nutanix-csi-kustomize
99

10-
namespace: kube-system
10+
namespace: ntnx-system
1111

1212
helmCharts:
1313
- name: nutanix-csi-storage
@@ -16,3 +16,4 @@ helmCharts:
1616
version: ${NUTANIX_STORAGE_CSI_CHART_VERSION}
1717
includeCRDs: true
1818
skipTests: true
19+
namespace: ntnx-system

0 commit comments

Comments
 (0)