Run all components in one namespace

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

diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index d45d77d..c63e0af 100644 (file)
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -1,9 +1,11 @@
+#{{ if not .Values.disablePolicyNexus }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: nexus
-  namespace: {{ .Values.NS }}
+  name: policy-nexus
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.nexusReplicas }}
   selector:
     matchLabels:
       app: nexus
@@ -11,41 +13,35 @@ spec:
     metadata:
       labels:
         app: nexus
-      name: nexus
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "mariadb"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "nexus-readiness"
-          }
-          ]'
+      name: policy-nexus
     spec:
-      containers:
+      initContainers:
       - command:
-        - /bin/bash
-        - -c
-        - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d"
-        image: {{ .Values.image.policyNexus }}
+        - /root/ready.py
+        args:
+        - --container-name
+        - mariadb
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: nexus-readiness
+      containers:
+      - image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: nexus
+        volumeMounts:
+        - name: localtime
+          mountPath: /etc/localtime
+          readOnly: true
+      volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}