Merge pull request #63 from farodin91/free-set-config-location-for-cs…

…i-and-cpi use existing config for cpi
vsphere-tmm · Jun 6, 2023 · b8a3f85 · b8a3f85
2 parents 61162ae + 6892522
commit b8a3f85
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/charts/vsphere-cpi/Chart.yaml b/charts/vsphere-cpi/Chart.yaml
@@ -21,4 +21,4 @@ maintainers:
     email: myles@vmware.com
 name: vsphere-cpi
 sources:
-version: 1.4.0
+version: 1.5.0
diff --git a/charts/vsphere-cpi/templates/configmap.yaml b/charts/vsphere-cpi/templates/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.global.config.secretsInline }}
+{{- if not (or .Values.global.config.secretsInline .Values.global.config.existingConfig.enabled) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/vsphere-cpi/templates/daemonset.yaml b/charts/vsphere-cpi/templates/daemonset.yaml
@@ -28,10 +28,12 @@ spec:
   template:
     metadata:
       annotations:
+        {{- if not .Values.global.config.existingConfig.enabled }}
         {{- if not .Values.global.config.secretsInline }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         {{- end }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- end }}
         {{- if .Values.vSphereCPI.podAnnotations }}
         {{- include "common.tplvalues.render" (dict "value" .Values.vSphereCPI.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
@@ -137,13 +139,23 @@ spec:
       {{- end }}
       volumes:
         - name: vsphere-config-volume
+          {{- if not .Values.global.config.existingConfig.enabled }}
           {{- if not .Values.global.config.secretsInline }}
           configMap:
             name: {{ template "common.names.fullname" . }}
           {{- else }}
           secret:
             secretName: {{ template "common.names.fullname" . }}
           {{- end }}
+          {{- else }}
+          {{- if eq .Values.global.config.existingConfig.type "Secret" }}
+          secret:
+            secretName: {{ .Values.global.config.existingConfig.name }}
+          {{- else }}
+          configMap:
+            name: {{ .Values.global.config.existingConfig.name }}
+          {{- end }}
+          {{- end }}
         {{- if .Values.global.config.externalKubeconfig.enabled }}
         - name: kubeconfig-volume
           secret:

diff --git a/charts/vsphere-cpi/templates/secret.yaml b/charts/vsphere-cpi/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.global.config.existingConfig.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -43,3 +44,4 @@ stringData:
     {{- include "common.tplvalues.render" ( dict "value" .Values.global.config.labels "context" $ ) | nindent 6 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/vsphere-cpi/values.yaml b/charts/vsphere-cpi/values.yaml
@@ -18,6 +18,10 @@ global:
       enabled: false
       secretName: ""
       keyName: "value"
+    existingConfig:
+      enabled: false
+      type: Secret # or ConfigMap
+      name: vsphere-cpi
     secretsInline: true
     # Global properties in this section will be used for all specified vCenters unless overriden in VirtualCenter section.
     # global: