Merge pull request #322 from openebs/chart_v1.6.0

feat(helm): version bump for v1.6.0
openebs · Jul 5, 2024 · b59f196 · b59f196
2 parents 439bbc7 + f447a27
commit b59f196
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 23 deletions.
diff --git a/deploy/helm/charts/Chart.yaml b/deploy/helm/charts/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: lvm-localpv
 description: CSI Driver for dynamic provisioning of LVM Persistent Local Volumes.
-version: 1.5.1
-appVersion: 1.5.0
+version: 1.6.0
+appVersion: 1.6.0
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
 home: https://openebs.io/
 keywords:
@@ -16,5 +16,5 @@ sources:
 - https://github.com/openebs/lvm-localpv
 dependencies:
   - name: crds
-    version: 1.5.1
+    version: 1.6.0
     condition: crds.enabled
diff --git a/deploy/helm/charts/README.md b/deploy/helm/charts/README.md
@@ -92,7 +92,7 @@ helm install openebs-lvmlocalpv openebs-lvmlocalpv/lvm-localpv --namespace opene
 | `lvmPlugin.image.registry`                          | Registry for openebs-lvm-plugin image                                            | `""`                                    |
 | `lvmPlugin.image.repository`                        | Image repository for openebs-lvm-plugin                                          | `openebs/lvm-driver`                    |
 | `lvmPlugin.image.pullPolicy`                        | Image pull policy for openebs-lvm-plugin                                         | `IfNotPresent`                          |
-| `lvmPlugin.image.tag`                               | Image tag for openebs-lvm-plugin                                                 | `1.5.0`                                 |
+| `lvmPlugin.image.tag`                               | Image tag for openebs-lvm-plugin                                                 | `1.6.0`                                 |
 | `lvmPlugin.metricsPort`                             | The TCP port number used for exposing lvm-metrics                                | `9500`                                  |
 | `lvmPlugin.allowedTopologies`                       | The comma seperated list of allowed node topologies                              | `kubernetes.io/hostname,`               |
 | `lvmNode.driverRegistrar.image.registry`            | Registry for csi-node-driver-registrar image                                     | `registry.k8s.io/`                      |

diff --git a/deploy/helm/charts/charts/crds/Chart.yaml b/deploy/helm/charts/charts/crds/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: crds
-version: 1.5.1
+version: 1.6.0
 description: A Helm chart that collects CustomResourceDefinitions (CRDs) from lvm-localpv.
diff --git a/deploy/helm/charts/templates/_helpers.tpl b/deploy/helm/charts/templates/_helpers.tpl
@@ -136,3 +136,10 @@ Create the name of the priority class for csi controller plugin
 {{- printf "%s" .Values.lvmController.priorityClass.name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
+
+{{/*
+Ensure that the path to kubelet ends with a slash
+*/}}
+{{- define "lvmlocalpv.lvmNode.kubeletDir" -}}
+{{- printf "%s/" (.Values.lvmNode.kubeletDir | trimSuffix "/") -}}
+{{- end }}
diff --git a/deploy/helm/charts/templates/lvm-controller.yaml b/deploy/helm/charts/templates/lvm-controller.yaml
@@ -23,16 +23,6 @@ spec:
         {{ toYaml . | nindent 8 }}
         {{- end}}
     spec:
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
-                operator: In
-                values:
-                - openebs-lvm-controller
-            topologyKey: "kubernetes.io/hostname"
 {{- if .Values.lvmController.priorityClass.create }}
       priorityClassName: {{ template "lvmlocalpv.lvmController.priorityClassName" . }}
 {{- end }}

diff --git a/deploy/helm/charts/templates/lvm-node.yaml b/deploy/helm/charts/templates/lvm-node.yaml
@@ -47,7 +47,7 @@ spec:
             - name: ADDRESS
               value: /plugin/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: {{ .Values.lvmNode.kubeletDir }}plugins/lvm-localpv/csi.sock
+              value: {{ printf "%s%s" (include "lvmlocalpv.lvmNode.kubeletDir" .) "plugins/lvm-localpv/csi.sock" | quote }}
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -117,7 +117,7 @@ spec:
             - name: device-dir
               mountPath: /dev
             - name: pods-mount-dir
-              mountPath: {{ .Values.lvmNode.kubeletDir }}
+              mountPath: {{ include "lvmlocalpv.lvmNode.kubeletDir" . | quote }}
               # needed so that any mounts setup inside this container are
               # propagated back to the host machine.
               mountPropagation: "Bidirectional"
@@ -130,15 +130,15 @@ spec:
             type: Directory
         - name: registration-dir
           hostPath:
-            path: {{ .Values.lvmNode.kubeletDir }}plugins_registry/
+            path: {{ printf "%s%s" (include "lvmlocalpv.lvmNode.kubeletDir" .) "plugins_registry/" | quote }}
             type: DirectoryOrCreate
         - name: plugin-dir
           hostPath:
-            path: {{ .Values.lvmNode.kubeletDir }}plugins/lvm-localpv/
+            path: {{ printf "%s%s" (include "lvmlocalpv.lvmNode.kubeletDir" .) "plugins/lvm-localpv/" | quote }}
             type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
-            path: {{ .Values.lvmNode.kubeletDir }}
+            path: {{ include "lvmlocalpv.lvmNode.kubeletDir" . | quote }}
             type: Directory
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/deploy/helm/charts/values.yaml b/deploy/helm/charts/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 release:
-  version: "1.5.1"
+  version: "1.6.0"
 
 imagePullSecrets:
 # - name: "image-pull-secret"
@@ -151,7 +151,7 @@ lvmPlugin:
     repository: openebs/lvm-driver
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 1.5.0
+    tag: 1.6.0
   ioLimits:
     enabled: false
     containerRuntime: containerd

diff --git a/tests/lvm_utils.go b/tests/lvm_utils.go
@@ -147,7 +147,7 @@ func extendVg(name string, device string) {
 	gomega.Expect(err_vg).To(gomega.BeNil(), "vg extend failed")
 }
 
-// Does vgremove on specified vg with -y flag if vg isnt empty after fer retires.
+// Does vgremove on specified vg with -y flag if vg isnt empty after few retires.
 func removeVg(name string) {
 	ginkgo.By("Removing vg")
 	retries := 3