Merge "Incorrect start-kafka.sh mounted to global-kafka"

[oom.git] / kubernetes / policy / templates / dep-brmsgw.yaml

diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index e535cf2..7a1bcde 100644 (file)
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disablePolicyBrmsgw }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -13,55 +14,49 @@ spec:
       labels:
         app: brmsgw
       name: brmsgw
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "mariadb",
-                  "--container-name",
-                  "nexus",
-                  "--container-name",
-                  "pap",
-                  "--container-name",
-                  "pdp",
-                  "--container-name",
-                  "pypdp"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "brmsgw-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - mariadb
+        - --container-name
+        - nexus
+        - --container-name
+        - pap
+        - --container-name
+        - pdp
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: brmsgw-readiness
       containers:
       - command:
         - /bin/bash
         - ./do-start.sh
         - brmsgw
-        image: {{ .Values.image.policyPe }}
+        image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion}}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: brmsgw
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /tmp/policy-install/config
           name: pe
       volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
         - name: pe
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}