charts: update volumesnapshot related fields

- rbac: we need capability to operate volumesnapshot - controller: add snapshotter - misc cleanup Signed-off-by: Vicente Cheng <[email protected]>
harvester · Sep 19, 2024 · ef8a7b6 · ef8a7b6
1 parent 06946d0
commit ef8a7b6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/charts/harvester-csi-driver-lvm/Chart.yaml b/charts/harvester-csi-driver-lvm/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/harvester-csi-driver-lvm/templates/_helpers.tpl b/charts/harvester-csi-driver-lvm/templates/_helpers.tpl
@@ -30,6 +30,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "externalImages.csiSnapshotter" -}}
+{{- if .Values.customCSISidecars.enabled -}}
+{{- print .Values.customCSISidecars.snapshotter -}}
+{{- else -}}
+{{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.3.4" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "externalImages.csiNodeDriverRegistrar" -}}
 {{- if .Values.customCSISidecars.enabled -}}
 {{- print .Values.customCSISidecars.registrar -}}

diff --git a/charts/harvester-csi-driver-lvm/templates/controller.yaml b/charts/harvester-csi-driver-lvm/templates/controller.yaml
@@ -71,6 +71,17 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
+        - name: csi-snapshotter
+          image: {{ template "externalImages.csiSnapshotter" . }}
+          imagePullPolicy: IfNotPresent
+          args:
+            - -v=5
+            - -csi-address=/csi/csi.sock
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
       volumes:
         - hostPath:
             path: {{ .Values.kubernetes.kubeletPath }}/plugins/{{ .Values.lvm.driverName }}

diff --git a/charts/harvester-csi-driver-lvm/templates/csi.yaml b/charts/harvester-csi-driver-lvm/templates/csi.yaml
@@ -42,7 +42,7 @@ spec:
         resources: {}
         securityContext:
           privileged: true
-        terminationMessagePath: /dev/termination-log
+        terminationMessagePath: /termination.log
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /csi
@@ -115,7 +115,7 @@ spec:
         image: {{ template "externalImages.csiLivenessprobe" . }}
         imagePullPolicy: IfNotPresent
         resources: {}
-        terminationMessagePath: /dev/termination-log
+        terminationMessagePath: /termination.log
         terminationMessagePolicy: File
         volumeMounts:
         - mountPath: /csi

diff --git a/charts/harvester-csi-driver-lvm/templates/rbac.yaml b/charts/harvester-csi-driver-lvm/templates/rbac.yaml
@@ -33,6 +33,9 @@ rules:
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments/status"]
     verbs: ["patch"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotclasses", "volumesnapshots", "volumesnapshotcontents", "volumesnapshotcontents/status"]
+    verbs: ["*"]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/harvester-csi-driver-lvm/values.yaml b/charts/harvester-csi-driver-lvm/values.yaml
@@ -48,11 +48,12 @@ customCSISidecars:
 
   ## uncomment and set these if enabled=true
 
-  # attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
-  # livenessprobe: k8s.gcr.io/sig-storage/livenessprobe:v2.7.0
-  # provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
-  # registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
-  # resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+  # attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
+  # livenessprobe: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
+  # provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
+  # registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.2
+  # resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
+  # snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.4
 
 nodeSelector:
   # The plugin daemonset will run on all nodes if it has a toleration,