diff options
author | 2018-04-19 19:01:27 +0000 | |
---|---|---|
committer | 2018-04-19 19:01:27 +0000 | |
commit | 87274bc2e86ea15b777b82be36ad029e3f94bac7 (patch) | |
tree | f2374222403578a3fa53e5f0b5f30fef26979207 /kubernetes/sdnc/charts/sdnc-portal/templates | |
parent | 100cfd1d9f8fefbb0338fc5122d936976f51f1b7 (diff) | |
parent | 2d276e07fee5da514c9f7ff6d4182c18c5741c5c (diff) |
Merge "Fixes for SDNC portal pod"
Diffstat (limited to 'kubernetes/sdnc/charts/sdnc-portal/templates')
-rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml | 4 | ||||
-rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml index f2f2524dfd..fe08a96b39 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: sdnc-portal-configmap + name: {{ include "common.fullname" . }}-portal namespace: {{ include "common.namespace" . }} data: -{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml index 5e1293c37f..3ca8a6ba47 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml @@ -57,13 +57,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 }} @@ -82,7 +82,7 @@ spec: name: localtime readOnly: true - mountPath: {{ .Values.config.configDir }} - name: sdnc-conf + name: {{ include "common.fullname" . }}-portal resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} @@ -97,8 +97,8 @@ spec: - name: localtime hostPath: path: /etc/localtime - - name: sdnc-conf + - name: {{ include "common.fullname" . }}-portal configMap: - name: sdnc-portal-configmap + name: {{ include "common.fullname" . }}-portal imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file |