Skip to content

Commit 8fb5abe

Browse files
authored
fix: category race condition by updating Nutanix CSI to 3.0.0-2458 (#814)
**What problem does this PR solve?**: This version fixes a race condition when creating multiple PVs. https://github.com/nutanix-scratch/helm/releases/tag/nutanix-csi-storage-3.0.0-2458 Tested ``` kubectl get deploy -n ntnx-system -o yaml | grep "image: docker.io/nutanix/ntnx-csi" image: docker.io/nutanix/ntnx-csi:3.0.0-2458 ``` ``` kubectl get pv NAME CAPACITY ACCESS MODES RECLAIM POLICY STATUS CLAIM STORAGECLASS VOLUMEATTRIBUTESCLASS REASON AGE pvc-d13bf2f8-644d-424b-a347-811a78bdd11b 10Gi RWO Delete Bound e2e-volume-pvc-bound-to-pv/pv-volume-volume-pvc-bound-to-pv-tester-2-0 nutanix-volume <unset> 8m36s pvc-f1d988d2-5325-42cd-b873-6ed8649a4001 10Gi RWO Delete Bound e2e-volume-pvc-bound-to-pv/pv-volume-volume-pvc-bound-to-pv-tester-0 nutanix-volume <unset> 8m37s ``` **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent d8350c1 commit 8fb5abe

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

charts/cluster-api-runtime-extensions-nutanix/templates/csi/nutanix/manifests/helm-addon-installation.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ metadata:
88
name: '{{ .Values.hooks.csi.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
99
data:
1010
values.yaml: |-
11-
# The Secret containing the credentials will be created by the handler.
11+
# Disable creating the Prism Central credentials Secret, the Secret will be created by the handler.
1212
createPrismCentralSecret: false
13+
# Disable creating the Prism Element credentials Secret, it won't be used the CSI driver as configured here.
14+
createSecret: false
1315
pcSecretName: nutanix-csi-credentials
1416
1517
tolerations:

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ data:
4141
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://nutanix.github.io/helm/{{ end }}
4242
nutanix-storage-csi: |
4343
ChartName: nutanix-csi-storage
44-
ChartVersion: 3.0.0-beta.1912
45-
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://nutanix.github.io/helm-releases/{{ end }}
44+
ChartVersion: 3.0.0-2458
45+
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://nutanix-scratch.github.io/helm/{{ end }}
4646
snapshot-controller: |
4747
ChartName: snapshot-controller
4848
ChartVersion: 3.0.5

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace: kube-system
1111

1212
helmCharts:
1313
- name: nutanix-csi-storage
14-
repo: https://nutanix.github.io/helm-releases/
14+
repo: https://nutanix-scratch.github.io/helm/
1515
releaseName: nutanix-csi
1616
version: ${NUTANIX_STORAGE_CSI_CHART_VERSION}
1717
includeCRDs: true

hack/addons/mindthegap-helm-registry/repos.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ repositories:
4747
nutanix-cloud-provider:
4848
- 0.3.4
4949
nutanix-csi-storage:
50-
repoURL: https://nutanix.github.io/helm-releases/
50+
repoURL: https://nutanix-scratch.github.io/helm/
5151
charts:
5252
nutanix-csi-storage:
53-
- 3.0.0-beta.1912
53+
- 3.0.0-2458
5454
snapshot-controller:
5555
repoURL: https://piraeus.io/helm-charts/
5656
charts:

make/addons.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export CILIUM_VERSION := 1.15.6
66
export NODE_FEATURE_DISCOVERY_VERSION := 0.16.1
77
export CLUSTER_AUTOSCALER_CHART_VERSION := 9.37.0
88
export AWS_EBS_CSI_CHART_VERSION := 2.32.0
9-
export NUTANIX_STORAGE_CSI_CHART_VERSION := 3.0.0-beta.1912
9+
export NUTANIX_STORAGE_CSI_CHART_VERSION := 3.0.0-2458
1010
export LOCAL_PATH_CSI_CHART_VERSION := 0.0.29
1111
export SNAPSHOT_CONTROLLER_CHART_VERSION := 3.0.5
1212
# AWS CCM uses the same chart version for all kubernetes versions. The image used in the deployment will

0 commit comments

Comments
 (0)