Merge "[CONSUL] Add limits to consul chart."

[oom.git] / kubernetes / msb / charts / msb-iag / templates / deployment.yaml

diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
index 8975a32..42f36cd 100644 (file)
--- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/charts/msb-iag/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,7 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: extensions/v1beta1
+*/}}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -22,6 +24,9 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
@@ -34,7 +39,7 @@ spec:
       serviceAccountName: msb
       initContainers:
       - command:
-        - /root/ready.py
+        - /app/ready.py
         args:
         - --container-name
         - msb-discovery
@@ -44,7 +49,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
       containers:
@@ -81,6 +86,14 @@ spec:
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
+          - name: {{ include "common.fullname" . }}-cert
+            mountPath: /usr/local/openresty/nginx/ssl/cert/cert.crt
+            readOnly: true
+            subPath: "cert.crt"
+          - name: {{ include "common.fullname" . }}-cert
+            mountPath: /usr/local/openresty/nginx/html/cert/ca.crt
+            readOnly: true
+            subPath: "ca.crt"
           - mountPath: /usr/local/apiroute-works/logs
             name: {{ include "common.fullname" . }}-logs
           resources:
@@ -109,6 +122,9 @@ spec:
             name: {{ include "common.fullname" . }}-log-conf
             subPath: logback.xml
       volumes:
+        - name: {{ include "common.fullname" . }}-cert
+          secret:
+            secretName: {{ include "common.release" . }}-msb-https-cert
         - name: {{ include "common.fullname" . }}-log-conf
           configMap:
             name: {{ include "common.fullname" . }}-log