Sidecars definition in csi-driver-lvm chart. (#103)

metal-stack · Sep 24, 2024 · 9de7b22 · 9de7b22
1 parent 1af04d9
commit 9de7b22
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 65 deletions.
diff --git a/.github/workflows/csi-driver-lvm.yaml b/.github/workflows/csi-driver-lvm.yaml
@@ -12,15 +12,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Create k8s Kind Cluster
-      uses: helm/kind-action@v1.3.0
+      uses: helm/kind-action@v1.10.0
       with:
+        version: v0.24.0
         install_only: true
 
     - name: Test
       run: |
-        for i in 100 101; do fallocate -l 1G loop${i}.img ; sudo losetup /dev/loop${i} loop${i}.img; done
-        sudo losetup -a
         make test-csi-driver-lvm
+        make cleanup-csi-driver-lvm
diff --git a/charts/csi-driver-lvm/Chart.yaml b/charts/csi-driver-lvm/Chart.yaml
@@ -1,7 +1,7 @@
 name: csi-driver-lvm
-version: 0.6.4
+version: 0.7.0
 description: local persistend storage for lvm
-appVersion: v0.5.3
+appVersion: v0.6.0
 apiVersion: v1
 keywords:
 - storage

diff --git a/charts/csi-driver-lvm/templates/_helpers.tpl b/charts/csi-driver-lvm/templates/_helpers.tpl
diff --git a/charts/csi-driver-lvm/templates/controller.yaml b/charts/csi-driver-lvm/templates/controller.yaml
@@ -162,7 +162,7 @@ spec:
       serviceAccountName: csi-driver-lvm-controller
       containers:
         - name: csi-attacher
-          image: {{ template "externalImages.csiAttacher" . }}
+          image: {{ .Values.sidecarImages.attacher }}
           imagePullPolicy: IfNotPresent
           args:
             - --v=5
@@ -174,7 +174,7 @@ spec:
           - mountPath: /csi
             name: socket-dir
         - name: csi-provisioner
-          image: {{ template "externalImages.csiProvisioner" . }}
+          image: {{ .Values.sidecarImages.provisioner }}
           imagePullPolicy: IfNotPresent
           args:
             - -v=5
@@ -187,7 +187,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-resizer
-          image: {{ template "externalImages.csiResizer" . }}
+          image: {{ .Values.sidecarImages.resizer }}
           imagePullPolicy: IfNotPresent
           args:
             - -v=5

diff --git a/charts/csi-driver-lvm/templates/plugin.yaml b/charts/csi-driver-lvm/templates/plugin.yaml
@@ -157,7 +157,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: {{ template "externalImages.csiNodeDriverRegistrar" . }}
+        image: {{ .Values.sidecarImages.registrar }}
         imagePullPolicy: IfNotPresent
         resources: {}
         securityContext:
@@ -241,7 +241,7 @@ spec:
         args:
         - --csi-address=/csi/csi.sock
         - --health-port=9898
-        image: {{ template "externalImages.csiLivenessprobe" . }}
+        image: {{ .Values.sidecarImages.livenessprobe }}
         imagePullPolicy: IfNotPresent
         resources: {}
         securityContext:

diff --git a/charts/csi-driver-lvm/values.yaml b/charts/csi-driver-lvm/values.yaml
@@ -21,14 +21,21 @@ compat03x: false
 
 pluginImage:
   repository: ghcr.io/metal-stack/csi-driver-lvm
-  tag: v0.5.3
+  tag: v0.6.0
   pullPolicy: IfNotPresent
 
 provisionerImage:
   repository: ghcr.io/metal-stack/csi-driver-lvm-provisioner
-  tag: v0.5.3
+  tag: v0.6.0
   pullPolicy: IfNotPresent
 
+sidecarImages:
+  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
+
 kubernetes:
   kubeletPath: /var/lib/kubelet
 
@@ -48,17 +55,6 @@ storageClasses:
     additionalAnnotations: []
     reclaimPolicy: Delete
 
-customCSISidecars:
-  enabled: false
-
-  ## 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
-
 nodeSelector:
   # The plugin daemonset will run on all nodes if it has a toleration,
   # so it is not necessary to set a nodeSelector for it

diff --git a/tests/csi-driver-lvm/Dockerfile b/tests/csi-driver-lvm/Dockerfile
@@ -1,7 +1,7 @@
-FROM dtzar/helm-kubectl:3.9.4 as helm-kubectl
+FROM dtzar/helm-kubectl:3.16 AS helm-kubectl
 
 FROM bats/bats
 COPY --from=helm-kubectl /usr/local/bin/helm /usr/local/bin/helm
 COPY --from=helm-kubectl /usr/local/bin/kubectl /usr/local/bin/kubectl
 
-ENTRYPOINT [ "bats" ]
+ENTRYPOINT ["bats"]