From 4e5dd65aad67a73e80d48fec4ef113fbf791aa33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= <batuhan.apaydin@trendyol.com>
Date: Tue, 1 Nov 2022 17:26:56 +0300
Subject: [PATCH] move spiffe-csi-driver and node-driver-registrar to values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 charts/spire/README.md                      |  4 ++++
 charts/spire/templates/agent-daemonset.yaml | 10 +++++-----
 charts/spire/values.yaml                    | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/charts/spire/README.md b/charts/spire/README.md
index 55b740d..c197268 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -65,6 +65,10 @@ Kubernetes: `>=1.21.0-0`
 | fullnameOverride | string | `""` |  |
 | imagePullSecrets | list | `[]` |  |
 | nameOverride | string | `""` |  |
+| nodeDriverRegistrar.image.pullPolicy | string | `"IfNotPresent"` |  |
+| nodeDriverRegistrar.image.repository | string | `"quay.io/k8scsi/csi-node-driver-registrar"` |  |
+| nodeDriverRegistrar.image.tag | string | `"v2.0.1"` |  |
+| nodeDriverRegistrar.resources | object | `{}` |  |
 | oidc.acme.cacheDir | string | `"/run/spire"` |  |
 | oidc.acme.directoryUrl | string | `"https://acme-v02.api.letsencrypt.org/directory"` |  |
 | oidc.acme.emailAddress | string | `"letsencrypt@example.org"` |  |
diff --git a/charts/spire/templates/agent-daemonset.yaml b/charts/spire/templates/agent-daemonset.yaml
index cdc1eeb..dca0edb 100644
--- a/charts/spire/templates/agent-daemonset.yaml
+++ b/charts/spire/templates/agent-daemonset.yaml
@@ -63,8 +63,8 @@ spec:
             {{- toYaml .Values.agent.resources | nindent 12 }}
         # This is the container which runs the SPIFFE CSI driver.
         - name: spiffe-csi-driver
-          image: ghcr.io/spiffe/spiffe-csi-driver:nightly
-          imagePullPolicy: IfNotPresent
+          image: {{ .Values.csiDriver.image.repository}}:{{ .Values.csiDriver.image.tag}}
+          imagePullPolicy: {{ .Values.csiDriver.image.pullPolicy}}
           args: [
             "-workload-api-socket-dir", "/spire-agent-socket",
             "-csi-socket-path", "/spiffe-csi/csi.sock",
@@ -98,8 +98,8 @@ spec:
         # of all the little details required to register a CSI driver with
         # the kubelet.
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1
-          imagePullPolicy: IfNotPresent
+          image: {{ .Values.nodeDriverRegistrar.image.repository }}:{{ .Values.nodeDriverRegistrar.image.tag }}
+          imagePullPolicy: {{ .Values.nodeDriverRegistrar.image.pullPolicy }}
           args: [
             "-csi-address", "/spiffe-csi/csi.sock",
             "-kubelet-registration-path", "/var/lib/kubelet/plugins/csi.spiffe.io/csi.sock",
@@ -113,7 +113,7 @@ spec:
             - name: kubelet-plugin-registration-dir
               mountPath: /registration
           resources:
-            {{- toYaml .Values.csiDriver.resources | nindent 12 }}
+            {{- toYaml .Values.nodeDriverRegistrar.resources | nindent 12 }}
       volumes:
         - name: spire-config
           configMap:
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 8a85a0b..300adf6 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -72,6 +72,23 @@ csiDriver:
     #   cpu: 100m
     #   memory: 64Mi
 
+nodeDriverRegistrar:
+  image:
+    repository: quay.io/k8scsi/csi-node-driver-registrar
+    pullPolicy: IfNotPresent
+    tag: v2.0.1
+  resources: {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # requests:
+    #   cpu: 50m
+    #   memory: 32Mi
+    # limits:
+    #   cpu: 100m
+    #   memory: 64Mi
+
 oidc:
   enabled: false