Merge pull request #93 from dasmeta/fix-cronjob

fix(DMVP-3567): External ConfigMap
dasmeta · Feb 27, 2024 · a2b5dc8 · a2b5dc8
2 parents a3d4b76 + c0dfa47
commit a2b5dc8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.57
+version: 0.1.58
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.57"
+appVersion: "0.1.58"
diff --git a/charts/base/README.md b/charts/base/README.md
@@ -464,6 +464,10 @@ base:
       topologyKey: kubernetes.io/hostname
       whenUnsatisfiable: ScheduleAnyway
 
+### Connect to external configmap
+
+  externalConfigmap:
+    name: docflow-config
 
 ### Init container
 

diff --git a/charts/base/templates/configmap.yml b/charts/base/templates/configmap.yml
@@ -1,9 +1,11 @@
+{{- if .Values.config }}
 kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "base.fullname" . }}
 data:
   {{- toYaml .Values.config | nindent 2 }}
+{{- end }}
 
 ---
 {{- if .Values.extraContainer.configmap }}

diff --git a/charts/base/templates/deployment.yaml b/charts/base/templates/deployment.yaml
@@ -219,8 +219,14 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           envFrom:
+            {{- if .Values.config }}
             - configMapRef:
                 name: {{ include "base.fullname" . }}
+            {{- end }}
+            {{- if .Values.externalConfigmap }}
+            - configMapRef:
+                name:  {{ .Values.externalConfigmap.name }}
+            {{- end }}
             {{- if eq .Values.secretsDefaultEngine "ExternalSecrets" }}
             - secretRef:
                 name: {{ include "base.fullname" . }}