diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-03-28 18:45:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-28 18:45:50 +0000 |
| commit | 28fac1986e92cc8438217f00cb1ea67f9bccb69a (patch) | |
| tree | fdddb0763f7f184a98809a5df4cbdeb1ee6b3052 | |
| parent | 7352f439cf3ca9ecc2995995fe53d05c103e5fde (diff) | |
| parent | 05b57f85d0bbe11c0f8e10d6a25c5c324a8ab13e (diff) | |
Merge "champ and gizmo hotfix"
| -rw-r--r-- | kubernetes/aai/charts/champ/templates/deployment.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/aai/charts/gizmo/templates/deployment.yaml | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/kubernetes/aai/charts/champ/templates/deployment.yaml b/kubernetes/aai/charts/champ/templates/deployment.yaml index a1a1d0ad06..23314aeee4 100644 --- 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 768c28b161..80b5390d08 100644 --- 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" |