Merge "champ and gizmo hotfix"

diff --git a/kubernetes/aai/charts/champ/templates/deployment.yaml b/kubernetes/aai/charts/champ/templates/deployment.yaml
index a1a1d0a..23314ae 100644 (file)
--- a/kubernetes/aai/charts/champ/templates/deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/charts/gizmo/templates/deployment.yaml b/kubernetes/aai/charts/gizmo/templates/deployment.yaml
index 768c28b..80b5390 100644 (file)
--- a/kubernetes/aai/charts/gizmo/templates/deployment.yaml
+++ b/kubernetes/aai/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"