NO-JIRA: Merge https://github.com/kubernetes-csi/csi-driver-nfs:master into main

.github/workflows/trivy.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v6
         with:
-          go-version: 1.24.9
+          go-version: 1.24.11
 
       - name: Build an image from Dockerfile
         run: |

charts/README.md

@@ -15,7 +15,7 @@
 
 ### install a specific version
 > [!IMPORTANT]  
-> Starting from version `4.11.0`, the prefix `v` is removed from hlem chart release so they are in line with [semver](https://semver.org). Therefore, when upgrading, refer to version `4.11.0` instead of `v4.11.0`.
+> Starting from version `4.11.0`, the prefix `v` is removed from helm chart release so they are in line with [semver](https://semver.org). Therefore, when upgrading, refer to version `4.11.0` instead of `v4.11.0`.
 
 ```console
 helm repo add csi-driver-nfs https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts

charts/latest/csi-driver-nfs/values.yaml

@@ -6,27 +6,27 @@ image:
         tag: canary
         pullPolicy: IfNotPresent
     csiProvisioner:
-        repository: registry.k8s.io/sig-storage/csi-provisioner
+        repository: /sig-storage/csi-provisioner
         tag: v6.0.0
         pullPolicy: IfNotPresent
     csiResizer:
-        repository: registry.k8s.io/sig-storage/csi-resizer
+        repository: /sig-storage/csi-resizer
         tag: v2.0.0
         pullPolicy: IfNotPresent
     csiSnapshotter:
-        repository: registry.k8s.io/sig-storage/csi-snapshotter
+        repository: /sig-storage/csi-snapshotter
         tag: v8.4.0
         pullPolicy: IfNotPresent
     livenessProbe:
-        repository: registry.k8s.io/sig-storage/livenessprobe
+        repository: /sig-storage/livenessprobe
         tag: v2.17.0
         pullPolicy: IfNotPresent
     nodeDriverRegistrar:
-        repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+        repository: /sig-storage/csi-node-driver-registrar
         tag: v2.15.0
         pullPolicy: IfNotPresent
     externalSnapshotter:
-        repository: registry.k8s.io/sig-storage/snapshot-controller
+        repository: /sig-storage/snapshot-controller
         tag: v8.4.0
         pullPolicy: IfNotPresent
 

deploy/example/nfs-provisioner/nginx-pod.yaml

@@ -16,7 +16,7 @@ spec:
     - nfsvers=4.1
   csi:
     driver: nfs.csi.k8s.io
-    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # volumeHandle format: {nfs-server-address}#{share-name}#{sub-dir-name}
     # make sure this value is unique for every share in the cluster
     volumeHandle: nfs-server.default.svc.cluster.local/share##
     volumeAttributes:

deploy/example/pv-nfs-csi.yaml

@@ -16,7 +16,7 @@ spec:
     - nfsvers=4.1
   csi:
     driver: nfs.csi.k8s.io
-    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # volumeHandle format: {nfs-server-address}#{share-name}#{sub-dir-name}
     # make sure this value is unique for every share in the cluster
     volumeHandle: nfs-server.default.svc.cluster.local/share##
     volumeAttributes:

docs/driver-parameters.md

@@ -14,7 +14,7 @@ onDelete | when volume is deleted, keep the directory if it's `retain` | `delete
 
  - VolumeID(`volumeHandle`) is the identifier of the volume handled by the driver, format of VolumeID:
 ```
-{nfs-server-address}#{sub-dir-name}#{share-name}
+{nfs-server-address}#{share-name}#{sub-dir-name}
 ```
 > example: `nfs-server.default.svc.cluster.local/share#subdir#`
 
@@ -23,7 +23,7 @@ onDelete | when volume is deleted, keep the directory if it's `retain` | `delete
 
 Name | Meaning | Example Value | Mandatory | Default value
 --- | --- | --- | --- | ---
-volumeHandle | Specify a value the driver can use to uniquely identify the share in the cluster. | A recommended way to produce a unique value is to combine the nfs-server address, sub directory name and share name: `{nfs-server-address}#{sub-dir-name}#{share-name}`. | Yes |
+volumeHandle | Specify a value the driver can use to uniquely identify the share in the cluster. | A recommended way to produce a unique value is to combine the nfs-server address, sub directory name and share name: `{nfs-server-address}#{share-name}#{sub-dir-name}`. | Yes |
 volumeAttributes.server | NFS Server address | domain name `nfs-server.default.svc.cluster.local` <br>or IP address `127.0.0.1` | Yes |
 volumeAttributes.share | NFS share path | `/` |  Yes  |
 volumeAttributes.mountPermissions | mounted folder permissions. The default is `0`, if set as non-zero, driver will perform `chmod` after mount |  | No |

hack/verify-helm-chart.sh

@@ -22,7 +22,13 @@ function get_image_from_helm_chart() {
   local -r image_name="${1}"
   image_repository="$(cat ${PKG_ROOT}/charts/latest/csi-driver-nfs/values.yaml | yq -r .image.${image_name}.repository)"
   image_tag="$(cat ${PKG_ROOT}/charts/latest/csi-driver-nfs/values.yaml | yq -r .image.${image_name}.tag)"
-  echo "${image_repository}:${image_tag}"
+  # If repository starts with /, prepend baseRepo
+  if [[ "${image_repository}" == /* ]]; then
+    base_repo="$(cat ${PKG_ROOT}/charts/latest/csi-driver-nfs/values.yaml | yq -r .image.baseRepo)"
+    echo "${base_repo}${image_repository}:${image_tag}"
+  else
+    echo "${image_repository}:${image_tag}"
+  fi
 }
 
 function validate_image() {