From 8bc9a7ca202e417cd82b1fd639c11a4a2daf6a56 Mon Sep 17 00:00:00 2001 From: kj Date: Wed, 28 Mar 2018 18:10:32 +0300 Subject: [PATCH] champ and gizmo hotfix fixes added sue to yaml validation issues Issue-ID: OOM-836 Change-Id: I9e03d85526ee9e6d5fbd893011db6ff15f95b74f Signed-off-by: kj --- charts/champ/templates/deployment.yaml | 5 ++--- charts/gizmo/templates/deployment.yaml | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/charts/champ/templates/deployment.yaml b/charts/champ/templates/deployment.yaml index a1a1d0a..23314ae 100644 --- a/charts/champ/templates/deployment.yaml +++ b/charts/champ/templates/deployment.yaml @@ -38,13 +38,13 @@ spec: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container - {{- if eq .Values.liveness.enabled true }} + {{ if .Values.liveness.enabled }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} + {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -86,7 +86,6 @@ spec: - name: localtime hostPath: path: /etc/localtime - readOnly: true - name: {{ include "common.fullname" . }}-config configMap: name: {{ include "common.fullname" . }}-configmap diff --git a/charts/gizmo/templates/deployment.yaml b/charts/gizmo/templates/deployment.yaml index 768c28b..80b5390 100644 --- a/charts/gizmo/templates/deployment.yaml +++ b/charts/gizmo/templates/deployment.yaml @@ -38,13 +38,13 @@ spec: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container - {{- if eq .Values.liveness.enabled true }} + {{ if .Values.liveness.enabled }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} + {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -111,7 +111,6 @@ spec: - name: localtime hostPath: path: /etc/localtime - readOnly: true - name: {{ include "common.fullname" . }}-data-filebeat emptyDir: {} - name: filebeat-conf @@ -140,4 +139,4 @@ spec: configMap: name: {{ include "common.fullname" . }}-model-configmap imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key" -- 2.16.6