Run all components in one namespace

[oom.git] / kubernetes / vnfsdk / templates / refrepo-deployment.yaml

diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
index 3accb96..ba13292 100644 (file)
--- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
@@ -1,10 +1,11 @@
+#{{ if not .Values.disableVnfsdkRefrepo }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
     app: refrepo
-  name: refrepo
-  namespace: "{{ .Values.nsPrefix }}-vnfsdk"
+  name: vnfsdk-refrepo
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -13,34 +14,23 @@ spec:
     metadata:
       labels:
         app: refrepo
-      name: refrepo
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "postgres"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "vnfsdk-readiness"
-          }
-          ]'
+      name: vnfsdk-refrepo
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - postgres
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: vnfsdk-readiness
       containers:
       - image: {{ .Values.image.refrepoImage }}:{{ .Values.image.refrepoVersion }}
         imagePullPolicy: {{ .Values.pullPolicy }}
@@ -52,3 +42,4 @@ spec:
           periodSeconds: 10
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}