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

fix labels to use
motiv-labs · Dec 16, 2019 · e877c17 · e877c17
2 parents e15425c + 6eef3a2
commit e877c17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/janus/README.md b/janus/README.md
@@ -41,6 +41,7 @@ The following table lists the configurable parameters of the Janus chart and the
 | `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.labels`                 | Add custom labels to the deployment                           | `app: janus`                                             |
 | `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
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "janus.fullname" . }}
   labels:
 {{ include "janus.labels" . | indent 4 }}
-{{ .Values.deployment.labels | indent 4 }}
+{{ toYaml .Values.deployment.labels | indent 4 }}
 spec:
   replicas: {{ .Values.deployment.replicaCount }}
   selector:
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       labels:
-        {{ .Values.deployment.labels | indent 8 }}
+{{ toYaml .Values.deployment.labels | indent 8 }}
         app.kubernetes.io/name: {{ include "janus.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if or (.Values.deployment.podAnnotations) (.Values.deployment.PodAnnotations) }}