Merge pull request #406 from aramase/release-v0.0.18

release: update manifest and helm charts for v0.0.18
kubernetes-sigs · Dec 11, 2020 · efe288d · efe288d
2 parents b2d2640 + 1b5743f
commit efe288d
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -248,5 +248,8 @@ promote-staging-manifest:
 	@cp -r manifest_staging/deploy .
 	@rm -rf charts/secrets-store-csi-driver
 	@cp -r manifest_staging/charts/secrets-store-csi-driver ./charts
-	@helm package ./charts/secrets-store-csi-driver -d ./charts/
-	@helm repo index ./charts --url https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts
+	@mkdir -p ./charts/tmp
+	@helm package ./charts/secrets-store-csi-driver -d ./charts/tmp/
+	@helm repo index ./charts/tmp --url https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts --merge ./charts/index.yaml
+	@mv ./charts/tmp/* ./charts
+	@rm -rf ./charts/tmp
diff --git a/charts/index.yaml b/charts/index.yaml
@@ -1,6 +1,23 @@
 apiVersion: v1
 entries:
   secrets-store-csi-driver:
+  - apiVersion: v1
+    appVersion: 0.0.18
+    created: "2020-12-10T16:54:59.318983-08:00"
+    description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
+      cluster.
+    digest: 1f096be8bb4afdb001f03d0074f1629ad0fa6459388862df3e3ad5f98b4288cf
+    icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
+    kubeVersion: '>=1.16.0-0'
+    maintainers:
+    - email: [email protected]
+      name: Rita Zhang
+    name: secrets-store-csi-driver
+    sources:
+    - https://github.com/kubernetes-sigs/secrets-store-csi-driver
+    urls:
+    - https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.0.18.tgz
+    version: 0.0.18
   - apiVersion: v1
     appVersion: 0.0.17
     created: "2020-11-10T12:43:33.124534-08:00"
@@ -154,4 +171,4 @@ entries:
     urls:
     - https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.0.9.tgz
     version: 0.0.9
-generated: "2020-11-10T12:43:33.109635-08:00"
+generated: "2020-12-10T16:54:59.317928-08:00"
diff --git a/charts/secrets-store-csi-driver-0.0.18.tgz b/charts/secrets-store-csi-driver-0.0.18.tgz
diff --git a/charts/secrets-store-csi-driver/Chart.yaml b/charts/secrets-store-csi-driver/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: secrets-store-csi-driver
-version: 0.0.17
-appVersion: 0.0.17
+version: 0.0.18
+appVersion: 0.0.18
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

diff --git a/charts/secrets-store-csi-driver/README.md b/charts/secrets-store-csi-driver/README.md
@@ -25,7 +25,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `fullnameOverride`                      | String to fully override secrets-store-csi-driver.fullname template with a string                                                 | `""`                                                |
 | `linux.image.repository`                | Linux image repository                                                                                                            | `k8s.gcr.io/csi-secrets-store/driver`               |
 | `linux.image.pullPolicy`                | Linux image pull policy                                                                                                           | `Always`                                            |
-| `linux.image.tag`                       | Linux image tag                                                                                                                   | `v0.0.17`                                           |
+| `linux.image.tag`                       | Linux image tag                                                                                                                   | `v0.0.18`                                           |
 | `linux.driver.resources`                | The resource request/limits for the linux secrets-store container image                                                           | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
 | `linux.enabled`                         | Install secrets store csi driver on linux nodes                                                                                   | true                                                |
 | `linux.kubeletRootDir`                  | Configure the kubelet root dir                                                                                                    | `/var/lib/kubelet`                                  |
@@ -45,7 +45,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.updateStrategy`                  | Configure a custom update strategy for the daemonset on linux nodes                                                               | `RollingUpdate with 1 maxUnavailable`               |
 | `windows.image.repository`              | Windows image repository                                                                                                          | `k8s.gcr.io/csi-secrets-store/driver`               |
 | `windows.image.pullPolicy`              | Windows image pull policy                                                                                                         | `IfNotPresent`                                      |
-| `windows.image.tag`                     | Windows image tag                                                                                                                 | `v0.0.17`                                           |
+| `windows.image.tag`                     | Windows image tag                                                                                                                 | `v0.0.18`                                           |
 | `windows.driver.resources`              | The resource request/limits for the windows secrets-store container image                                                         | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |
 | `windows.enabled`                       | Install secrets store csi driver on windows nodes                                                                                 | false                                               |
 | `windows.kubeletRootDir`                | Configure the kubelet root dir                                                                                                    | `C:\var\lib\kubelet`                                |

diff --git a/charts/secrets-store-csi-driver/templates/_helpers.tpl b/charts/secrets-store-csi-driver/templates/_helpers.tpl
@@ -32,3 +32,14 @@ labels:
   app: {{ template "sscd.name" . }}
   helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for CSIDriver.
+*/}}
+{{- define "csidriver.apiVersion" -}}
+{{- if semverCompare ">=1.18-0" .Capabilities.KubeVersion.Version }}
+{{- print "storage.k8s.io/v1" -}}
+{{- else -}}
+{{- print "storage.k8s.io/v1beta1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/secrets-store-csi-driver/templates/csidriver.yaml b/charts/secrets-store-csi-driver/templates/csidriver.yaml
@@ -1,4 +1,4 @@
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: {{ template "csidriver.apiVersion" . }}
 kind: CSIDriver
 metadata:
   name: secrets-store.csi.k8s.io

diff --git a/charts/secrets-store-csi-driver/values.yaml b/charts/secrets-store-csi-driver/values.yaml
@@ -2,7 +2,7 @@ linux:
   enabled: true
   image:
     repository: k8s.gcr.io/csi-secrets-store/driver
-    tag: v0.0.17
+    tag: v0.0.18
     pullPolicy: Always
 
   driver:
@@ -58,7 +58,7 @@ windows:
   enabled: false
   image:
     repository: k8s.gcr.io/csi-secrets-store/driver
-    tag: v0.0.17
+    tag: v0.0.18
     pullPolicy: IfNotPresent
 
   driver:

diff --git a/deploy/rbac-secretproviderclass.yaml b/deploy/rbac-secretproviderclass.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: secrets-store-csi-driver
-  namespace: default
+  namespace: kube-system
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -65,4 +65,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: secrets-store-csi-driver
-  namespace: default
+  namespace: kube-system
diff --git a/deploy/rbac-secretprovidersyncing.yaml b/deploy/rbac-secretprovidersyncing.yaml
@@ -28,4 +28,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: secrets-store-csi-driver
-  namespace: default
+  namespace: kube-system
diff --git a/deploy/secrets-store-csi-driver-windows.yaml b/deploy/secrets-store-csi-driver-windows.yaml
@@ -2,6 +2,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: csi-secrets-store-windows
+  namespace: kube-system
 spec:
   selector:
     matchLabels:
@@ -39,7 +40,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.17
+          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.18
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"

diff --git a/deploy/secrets-store-csi-driver.yaml b/deploy/secrets-store-csi-driver.yaml
@@ -2,6 +2,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: csi-secrets-store
+  namespace: kube-system
 spec:
   selector:
     matchLabels:
@@ -40,7 +41,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.17
+          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.18
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"

diff --git a/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml b/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: secrets-store-csi-driver
-version: 0.0.17
-appVersion: 0.0.17
+version: 0.0.18
+appVersion: 0.0.18
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

diff --git a/manifest_staging/charts/secrets-store-csi-driver/README.md b/manifest_staging/charts/secrets-store-csi-driver/README.md
@@ -25,7 +25,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `fullnameOverride`                      | String to fully override secrets-store-csi-driver.fullname template with a string                                                 | `""`                                                |
 | `linux.image.repository`                | Linux image repository                                                                                                            | `k8s.gcr.io/csi-secrets-store/driver`               |
 | `linux.image.pullPolicy`                | Linux image pull policy                                                                                                           | `Always`                                            |
-| `linux.image.tag`                       | Linux image tag                                                                                                                   | `v0.0.17`                                           |
+| `linux.image.tag`                       | Linux image tag                                                                                                                   | `v0.0.18`                                           |
 | `linux.driver.resources`                | The resource request/limits for the linux secrets-store container image                                                           | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
 | `linux.enabled`                         | Install secrets store csi driver on linux nodes                                                                                   | true                                                |
 | `linux.kubeletRootDir`                  | Configure the kubelet root dir                                                                                                    | `/var/lib/kubelet`                                  |
@@ -45,7 +45,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.updateStrategy`                  | Configure a custom update strategy for the daemonset on linux nodes                                                               | `RollingUpdate with 1 maxUnavailable`               |
 | `windows.image.repository`              | Windows image repository                                                                                                          | `k8s.gcr.io/csi-secrets-store/driver`               |
 | `windows.image.pullPolicy`              | Windows image pull policy                                                                                                         | `IfNotPresent`                                      |
-| `windows.image.tag`                     | Windows image tag                                                                                                                 | `v0.0.17`                                           |
+| `windows.image.tag`                     | Windows image tag                                                                                                                 | `v0.0.18`                                           |
 | `windows.driver.resources`              | The resource request/limits for the windows secrets-store container image                                                         | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |
 | `windows.enabled`                       | Install secrets store csi driver on windows nodes                                                                                 | false                                               |
 | `windows.kubeletRootDir`                | Configure the kubelet root dir                                                                                                    | `C:\var\lib\kubelet`                                |

diff --git a/manifest_staging/charts/secrets-store-csi-driver/values.yaml b/manifest_staging/charts/secrets-store-csi-driver/values.yaml
@@ -2,7 +2,7 @@ linux:
   enabled: true
   image:
     repository: k8s.gcr.io/csi-secrets-store/driver
-    tag: v0.0.17
+    tag: v0.0.18
     pullPolicy: Always
 
   driver:
@@ -58,7 +58,7 @@ windows:
   enabled: false
   image:
     repository: k8s.gcr.io/csi-secrets-store/driver
-    tag: v0.0.17
+    tag: v0.0.18
     pullPolicy: IfNotPresent
 
   driver:

diff --git a/manifest_staging/deploy/secrets-store-csi-driver-windows.yaml b/manifest_staging/deploy/secrets-store-csi-driver-windows.yaml
@@ -40,7 +40,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.17
+          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.18
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"

diff --git a/manifest_staging/deploy/secrets-store-csi-driver.yaml b/manifest_staging/deploy/secrets-store-csi-driver.yaml
@@ -41,7 +41,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.17
+          image: k8s.gcr.io/csi-secrets-store/driver:v0.0.18
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"