Merge pull request #424 from hellofresh/patch/update-deployment

allow option to add valuesFrom env vars
motiv-labs · Dec 13, 2019 · 82e0213 · 82e0213
2 parents 680e0cb + f394527
commit 82e0213
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/janus/README.md b/janus/README.md
@@ -40,6 +40,7 @@ The following table lists the configurable parameters of the Janus chart and the
 | `allowEmptyPassword`                | Allow DB blank passwords                                      | `yes`                                                    |
 | `deployment.replicaCount`           | Number of Janus pod replicas                                  | `2`                                                      |
 | `deployment.minAvailable`           | Creates PDB is min available (must be less than replicaCount) | `1`                                                      |
+| `deployment.valuesFrom`             | Add needed env vars from Kubernetes metadata                  | `POD_NAME`                                               |
 | `deployment.databaseDSN`            | Database connection string                                    | `mongodb://janus-database:27017/janus`                   |
 | `service.type`                      | Kubernetes Service type                                       | `LoadBalancer`                                           |
 | `service.name`                      | Override service name                                         | ``                                                       |

diff --git a/janus/templates/deployment.yaml b/janus/templates/deployment.yaml
@@ -32,6 +32,9 @@ spec:
               name: http-private
               protocol: TCP
           env:
+            {{- if .Values.deployment.valuesFrom }}
+            {{ toYaml .Values.deployment.valuesFrom  | nindent 12 }}
+            {{- end}}
             {{- if .Values.envConfig }}
             {{- range $key, $value := .Values.envConfig }}
             - name: {{ $key | quote }}

diff --git a/janus/values.yaml b/janus/values.yaml
@@ -9,6 +9,11 @@ deployment:
   replicaCount: 2
   minAvailable: 1
   databaseDSN: "mongodb://janus-database:27017/janus"
+  valuesFrom:
+    - name: POD_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.name
 
 imagePullSecrets: []