From ea2f7ecef26b59aaaff453c810f75cb823534d38 Mon Sep 17 00:00:00 2001
From: Tim Ebert <timebertt@gmail.com>
Date: Wed, 4 Jan 2023 17:05:48 +0100
Subject: [PATCH] Allow injecting generic-token-kubeconfig secret name into
 yawol-cloud-controller

---
 .../templates/yawol-cloud-controller.yaml     | 23 +++++++++++++++--
 charts/yawol-controller/values.yaml           | 25 +++----------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/charts/yawol-controller/templates/yawol-cloud-controller.yaml b/charts/yawol-controller/templates/yawol-cloud-controller.yaml
index c537eff7..3f98d4c6 100644
--- a/charts/yawol-controller/templates/yawol-cloud-controller.yaml
+++ b/charts/yawol-controller/templates/yawol-cloud-controller.yaml
@@ -77,8 +77,11 @@ spec:
         resources:
 {{ toYaml .Values.resources.yawolCloudController | indent 10 }}
         {{- end }}
-{{- if .Values.yawolCloudController.additionalVolumeMounts }}
         volumeMounts:
+        - mountPath: /var/run/secrets/gardener.cloud/shoot/generic-kubeconfig
+          name: kubeconfig
+          readOnly: true
+{{- if .Values.yawolCloudController.additionalVolumeMounts }}
 {{ toYaml .Values.yawolCloudController.additionalVolumeMounts | indent 8 }}
 {{- end }}
         securityContext:
@@ -89,8 +92,24 @@ spec:
               - ALL
       dnsPolicy: ClusterFirst
       restartPolicy: Always
-{{- if .Values.yawolCloudController.additionalVolumes }}
       volumes:
+      - name: kubeconfig
+        projected:
+          defaultMode: 420
+          sources:
+          - secret:
+              items:
+              - key: kubeconfig
+                path: kubeconfig
+              name: {{ .Values.genericTokenKubeconfigSecretName }}
+              optional: false
+          - secret:
+              items:
+              - key: token
+                path: token
+              name: shoot-access-cloud-controller-manager
+              optional: false
+{{- if .Values.yawolCloudController.additionalVolumes }}
 {{ toYaml .Values.yawolCloudController.additionalVolumes | indent 6 }}
 {{- end }}
 {{- end }}
diff --git a/charts/yawol-controller/values.yaml b/charts/yawol-controller/values.yaml
index 39b1ebde..fac6892f 100644
--- a/charts/yawol-controller/values.yaml
+++ b/charts/yawol-controller/values.yaml
@@ -17,27 +17,8 @@ yawolCloudController:
   clusterRoleEnabled: true
   additionalArguments:
     - -target-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig
-  additionalVolumes:
-    - name: kubeconfig
-      projected:
-        defaultMode: 420
-        sources:
-        - secret:
-            items:
-            - key: kubeconfig
-              path: kubeconfig
-            name: generic-token-kubeconfig
-            optional: false
-        - secret:
-            items:
-            - key: token
-              path: token
-            name: shoot-access-cloud-controller-manager
-            optional: false
-  additionalVolumeMounts:
-    - mountPath: /var/run/secrets/gardener.cloud/shoot/generic-kubeconfig
-      name: kubeconfig
-      readOnly: true
+  additionalVolumes: []
+  additionalVolumeMounts: []
   image:
     repository: ghcr.io/stackitcloud/yawol/yawol-cloud-controller
     tag: latest
@@ -117,3 +98,5 @@ yawolAvailabilityZone: ""
 
 # URL/IP of the Kubernetes API server that contains the LoadBalancer resources
 yawolAPIHost:
+
+genericTokenKubeconfigSecretName: generic-token-kubeconfig