Merge pull request #446 from weka/dev

Release 2.6.1 content
weka · Feb 9, 2025 · ff2c4e0 · ff2c4e0
2 parents 40261fa + 25787e5
commit ff2c4e0
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 13 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -113,7 +113,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.1
+        uses: helm/chart-testing-action@v2.7.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed

diff --git a/.github/workflows/push-dev.yaml b/.github/workflows/push-dev.yaml
@@ -122,7 +122,7 @@ jobs:
 
       # TEST CHART
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.1
+        uses: helm/chart-testing-action@v2.7.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -193,7 +193,7 @@ jobs:
           GPG_KEYRING_BASE64: "${{ secrets.GPG_KEYRING_BASE64 }}"
           GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
 
-      - uses: helm/chart-releaser-action@v1.6.0
+      - uses: helm/chart-releaser-action@v1.7.0
         env:
           CR_TOKEN: "${{ secrets.BOTTY_GH_TOKEN }}"
           CR_RELEASE_NAME_TEMPLATE: "v{{ .Version }}"

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # CSI WekaFS Driver
 Helm chart for Deployment of WekaIO Container Storage Interface (CSI) plugin for WekaFS - the world fastest filesystem
 
-![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.0](https://img.shields.io/badge/AppVersion-v2.6.0-informational?style=flat-square)
+![Version: 2.6.1-SNAPSHOT.6.233e4bd](https://img.shields.io/badge/Version-2.6.1--SNAPSHOT.6.233e4bd-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.1-SNAPSHOT.6.233e4bd](https://img.shields.io/badge/AppVersion-v2.6.1--SNAPSHOT.6.233e4bd-informational?style=flat-square)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/csi-wekafs)](https://artifacthub.io/packages/search?repo=csi-wekafs)
 
@@ -48,7 +48,7 @@ make build
 |-----|------|---------|-------------|
 | dynamicProvisionPath | string | `"csi-volumes"` | Directory in root of file system where dynamic volumes are provisioned |
 | csiDriverName | string | `"csi.weka.io"` | Name of the driver (and provisioner) |
-| csiDriverVersion | string | `"2.6.0"` | CSI driver version |
+| csiDriverVersion | string | `"2.6.1-SNAPSHOT.6.233e4bd"` | CSI driver version |
 | images.livenessprobesidecar | string | `"registry.k8s.io/sig-storage/livenessprobe:v2.15.0"` | CSI liveness probe sidecar image URL |
 | images.attachersidecar | string | `"registry.k8s.io/sig-storage/csi-attacher:v4.8.0"` | CSI attacher sidecar image URL |
 | images.provisionersidecar | string | `"registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"` | CSI provisioner sidecar image URL |
@@ -57,7 +57,7 @@ make build
 | images.snapshottersidecar | string | `"registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"` | CSI snapshotter sidecar image URL |
 | images.nodeinfo | string | `"quay.io/weka.io/csi-wekafs"` | CSI nodeinfo sidecar image URL, used for reading node metadata |
 | images.csidriver | string | `"quay.io/weka.io/csi-wekafs"` | CSI driver main image URL |
-| images.csidriverTag | string | `"2.6.0"` | CSI driver tag |
+| images.csidriverTag | string | `"2.6.1-SNAPSHOT.6.233e4bd"` | CSI driver tag |
 | imagePullSecret | string | `""` | image pull secret required for image download. Must have permissions to access all images above.    Should be used in case of private registry that requires authentication |
 | globalPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for all CSI driver components |
 | controllerPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for CSI controller component only (by default same as global) |
@@ -75,11 +75,15 @@ make build
 | controller.configureAttacherLeaderElection | bool | `true` | Configure attacher sidecar for leader election |
 | controller.nodeSelector | object | `{}` | optional nodeSelector for controller components only |
 | controller.affinity | object | `{}` | optional affinity for controller components only |
+| controller.labels | object | `{}` | optional labels to add to controller deployment |
+| controller.podLabels | object | `{}` | optional labels to add to controller pods |
 | node.maxConcurrentRequests | int | `5` | Maximum concurrent requests from sidecars (global) |
 | node.concurrency | object | `{"nodePublishVolume":5,"nodeUnpublishVolume":5}` | maximum concurrent operations per operation type (to avoid API starvation) |
 | node.grpcRequestTimeoutSeconds | int | `30` | Return GRPC Unavailable if request waits in queue for that long time (seconds) |
 | node.nodeSelector | object | `{}` | optional nodeSelector for node components only |
 | node.affinity | object | `{}` | optional affinity for node components only |
+| node.labels | object | `{}` | optional labels to add to node daemonset |
+| node.podLabels | object | `{}` | optional labels to add to node pods |
 | logLevel | int | `5` | Log level of CSI plugin |
 | useJsonLogging | bool | `false` | Use JSON structured logging instead of human-readable logging format (for exporting logs to structured log parser) |
 | legacyVolumeSecretName | string | `""` | for migration of pre-CSI 0.7.0 volumes only, default API secret. Must reside in same namespace as the plugin |

diff --git a/charts/csi-wekafsplugin/Chart.yaml b/charts/csi-wekafsplugin/Chart.yaml
@@ -6,12 +6,12 @@ maintainers:
     email: csi@weka.io
     url: https://weka.io
 sources:
-  - https://github.com/weka/csi-wekafs/tree/v2.6.0
+  - https://github.com/weka/csi-wekafs/tree/v$CHART_VERSION/charts/csi-wekafsplugin
 home: https://github.com/weka/csi-wekafs
 icon: https://weka.github.io/csi-wekafs/logo.png
 type: application
-version: 2.6.0
-appVersion: v2.6.0
+version: 2.6.1-SNAPSHOT.6.233e4bd
+appVersion: v2.6.1-SNAPSHOT.6.233e4bd
 keywords: [storage, filesystem, HPC]
 annotations:
   artifacthub.io/category: "storage"

diff --git a/charts/csi-wekafsplugin/README.md b/charts/csi-wekafsplugin/README.md
@@ -3,7 +3,7 @@ Helm chart for Deployment of WekaIO Container Storage Interface (CSI) plugin for
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/csi-wekafs)](https://artifacthub.io/packages/search?repo=csi-wekafs)
-![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.0](https://img.shields.io/badge/AppVersion-v2.6.0-informational?style=flat-square)
+![Version: 2.6.1-SNAPSHOT.6.233e4bd](https://img.shields.io/badge/Version-2.6.1--SNAPSHOT.6.233e4bd-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.1-SNAPSHOT.6.233e4bd](https://img.shields.io/badge/AppVersion-v2.6.1--SNAPSHOT.6.233e4bd-informational?style=flat-square)
 
 ## Homepage
 https://github.com/weka/csi-wekafs
@@ -52,7 +52,7 @@ helm install csi-wekafsplugin csi-wekafs/csi-wekafsplugin --namespace csi-wekafs
 |-----|------|---------|-------------|
 | dynamicProvisionPath | string | `"csi-volumes"` | Directory in root of file system where dynamic volumes are provisioned |
 | csiDriverName | string | `"csi.weka.io"` | Name of the driver (and provisioner) |
-| csiDriverVersion | string | `"2.6.0"` | CSI driver version |
+| csiDriverVersion | string | `"2.6.1-SNAPSHOT.6.233e4bd"` | CSI driver version |
 | images.livenessprobesidecar | string | `"registry.k8s.io/sig-storage/livenessprobe:v2.15.0"` | CSI liveness probe sidecar image URL |
 | images.attachersidecar | string | `"registry.k8s.io/sig-storage/csi-attacher:v4.8.0"` | CSI attacher sidecar image URL |
 | images.provisionersidecar | string | `"registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"` | CSI provisioner sidecar image URL |
@@ -61,7 +61,7 @@ helm install csi-wekafsplugin csi-wekafs/csi-wekafsplugin --namespace csi-wekafs
 | images.snapshottersidecar | string | `"registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"` | CSI snapshotter sidecar image URL |
 | images.nodeinfo | string | `"quay.io/weka.io/csi-wekafs"` | CSI nodeinfo sidecar image URL, used for reading node metadata |
 | images.csidriver | string | `"quay.io/weka.io/csi-wekafs"` | CSI driver main image URL |
-| images.csidriverTag | string | `"2.6.0"` | CSI driver tag |
+| images.csidriverTag | string | `"2.6.1-SNAPSHOT.6.233e4bd"` | CSI driver tag |
 | imagePullSecret | string | `""` | image pull secret required for image download. Must have permissions to access all images above.    Should be used in case of private registry that requires authentication |
 | globalPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for all CSI driver components |
 | controllerPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for CSI controller component only (by default same as global) |
@@ -79,11 +79,15 @@ helm install csi-wekafsplugin csi-wekafs/csi-wekafsplugin --namespace csi-wekafs
 | controller.configureAttacherLeaderElection | bool | `true` | Configure attacher sidecar for leader election |
 | controller.nodeSelector | object | `{}` | optional nodeSelector for controller components only |
 | controller.affinity | object | `{}` | optional affinity for controller components only |
+| controller.labels | object | `{}` | optional labels to add to controller deployment |
+| controller.podLabels | object | `{}` | optional labels to add to controller pods |
 | node.maxConcurrentRequests | int | `5` | Maximum concurrent requests from sidecars (global) |
 | node.concurrency | object | `{"nodePublishVolume":5,"nodeUnpublishVolume":5}` | maximum concurrent operations per operation type (to avoid API starvation) |
 | node.grpcRequestTimeoutSeconds | int | `30` | Return GRPC Unavailable if request waits in queue for that long time (seconds) |
 | node.nodeSelector | object | `{}` | optional nodeSelector for node components only |
 | node.affinity | object | `{}` | optional affinity for node components only |
+| node.labels | object | `{}` | optional labels to add to node daemonset |
+| node.podLabels | object | `{}` | optional labels to add to node pods |
 | logLevel | int | `5` | Log level of CSI plugin |
 | useJsonLogging | bool | `false` | Use JSON structured logging instead of human-readable logging format (for exporting logs to structured log parser) |
 | legacyVolumeSecretName | string | `""` | for migration of pre-CSI 0.7.0 volumes only, default API secret. Must reside in same namespace as the plugin |

diff --git a/charts/csi-wekafsplugin/templates/controllerserver-deployment.yaml b/charts/csi-wekafsplugin/templates/controllerserver-deployment.yaml
@@ -7,17 +7,25 @@ metadata:
     app: {{ .Release.Name }}-controller
     component: {{ .Release.Name }}-controller
     release: {{ .Release.Name }}
+    {{- if .Values.controller.labels }}
+    {{- toYaml .Values.controller.labels | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
       app: {{ .Release.Name }}-controller
+      component: {{ .Release.Name }}-controller
+      release: {{ .Release.Name }}
   replicas: {{ .Values.controller.replicas | default 1 }}
   template:
     metadata:
       labels:
         app: {{ .Release.Name }}-controller
         component: {{ .Release.Name }}-controller
         release: {{ .Release.Name }}
+        {{- if .Values.controller.podLabels }}
+        {{- toYaml .Values.controller.podLabels | nindent 8 }}
+        {{- end }}
     {{- if .Values.metrics.enabled }}
       annotations:
         prometheus.io/scrape: 'true'

diff --git a/charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml b/charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml
@@ -3,16 +3,28 @@ apiVersion: apps/v1
 metadata:
   name: {{ .Release.Name }}-node
   namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}-node
+    component: {{ .Release.Name }}-node
+    release: {{ .Release.Name }}
+    {{- if .Values.node.labels }}
+    {{- toYaml .Values.node.labels | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
       app: {{ .Release.Name }}-node
+      component: {{ .Release.Name }}-node
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
         app: {{ .Release.Name }}-node
         component: {{ .Release.Name }}-node
         release: {{ .Release.Name }}
+        {{- if .Values.node.podLabels }}
+        {{- toYaml .Values.node.podLabels | nindent 8 }}
+        {{- end }}
     {{- if .Values.metrics.enabled }}
       annotations:
         prometheus.io/scrape: 'true'

diff --git a/charts/csi-wekafsplugin/values.schema.json b/charts/csi-wekafsplugin/values.schema.json
@@ -46,12 +46,18 @@
                 "grpcRequestTimeoutSeconds": {
                     "type": "integer"
                 },
+                "labels": {
+                    "type": "object"
+                },
                 "maxConcurrentRequests": {
                     "type": "integer"
                 },
                 "nodeSelector": {
                     "type": "object"
                 },
+                "podLabels": {
+                    "type": "object"
+                },
                 "replicas": {
                     "type": "integer"
                 }
@@ -199,11 +205,17 @@
                 "grpcRequestTimeoutSeconds": {
                     "type": "integer"
                 },
+                "labels": {
+                    "type": "object"
+                },
                 "maxConcurrentRequests": {
                     "type": "integer"
                 },
                 "nodeSelector": {
                     "type": "object"
+                },
+                "podLabels": {
+                    "type": "object"
                 }
             }
         },

diff --git a/charts/csi-wekafsplugin/values.yaml b/charts/csi-wekafsplugin/values.yaml
@@ -5,7 +5,7 @@ dynamicProvisionPath: "csi-volumes"
 # -- Name of the driver (and provisioner)
 csiDriverName: "csi.weka.io"
 # -- CSI driver version
-csiDriverVersion: &csiDriverVersion 2.6.0
+csiDriverVersion: &csiDriverVersion 2.6.1-SNAPSHOT.6.233e4bd
 images:
   # -- CSI liveness probe sidecar image URL
   livenessprobesidecar: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
@@ -75,6 +75,10 @@ controller:
   nodeSelector: {}
   # -- optional affinity for controller components only
   affinity: {}
+  # -- optional labels to add to controller deployment
+  labels: {}
+  # -- optional labels to add to controller pods
+  podLabels: {}
 # Node-specific parameters, please do not change unless explicitly guided
 node:
   # -- Maximum concurrent requests from sidecars (global)
@@ -89,6 +93,10 @@ node:
   nodeSelector: {}
   # -- optional affinity for node components only
   affinity: {}
+  # -- optional labels to add to node daemonset
+  labels: {}
+  # -- optional labels to add to node pods
+  podLabels: {}
 # -- Log level of CSI plugin
 logLevel: 5
 # -- Use JSON structured logging instead of human-readable logging format (for exporting logs to structured log parser)