Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fcb73f
refactor: Tidy up Nutanix CSI with consistent apply strategy
jimmidyson Jun 20, 2024
ee8e7af
fix: revert namespace back to the ntnx-system
dkoshkin Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion charts/cluster-api-runtime-extensions-nutanix/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion hack/addons/kustomize/nutanix-snapshot-csi/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ helmCharts:
version: ${NUTANIX_SNAPSHOT_CSI_CHART_VERSION}
includeCRDs: true
skipTests: true
namespace: nutanix-system
2 changes: 0 additions & 2 deletions hack/addons/kustomize/nutanix-storage-csi/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/handlers/generic/lifecycle/csi/awsebs/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/generic/lifecycle/csi/localpath/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
235 changes: 0 additions & 235 deletions pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go
View file
Open in desktop

This file was deleted.

Loading
Loading