Run all components in one namespace

[oom.git] / kubernetes / portal / templates / portal-vnc-dep.yaml

diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
index 3a80572..0680a8a 100644 (file)
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -1,16 +1,16 @@
 #{{ if not .Values.disablePortalVncPortal }}
 kind: ConfigMap
 metadata:
-  name: vnc-profiles-ini
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-vnc-profiles-ini
+  namespace: "{{ .Values.nsPrefix }}"
 data:
 {{ (.Files.Glob "resources/vnc/init_profile/profiles.ini").AsConfig | indent 2 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: vnc-update-hosts
-  namespace: "{{ .Values.nsPrefix }}-portal"
+  name: portal-vnc-update-hosts
+  namespace: "{{ .Values.nsPrefix }}"
 data:
 {{ (.Files.Glob "resources/scripts/update_hosts.sh").AsConfig | indent 2 }}
 ---
@@ -18,19 +18,19 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
-    app: vnc-portal
-  name: vnc-portal
-  namespace: "{{ .Values.nsPrefix }}-portal"
+    app: portal-vnc
+  name: portal-vnc
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.vncPortalReplicas }}
   selector:
     matchLabels:
-      app: vnc-portal
+      app: portal-vnc
   template:
     metadata:
       labels:
-        app: vnc-portal
-      name: vnc-portal
+        app: portal-vnc
+      name: portal-vnc
     spec:
       initContainers:
       - command:
@@ -46,7 +46,7 @@ spec:
               fieldPath: metadata.namespace
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
-        name: vnc-portal-readiness
+        name: portal-vnc-readiness
       - command:
         - /root/ready.py
         args:
@@ -54,7 +54,7 @@ spec:
         - pap
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-policy
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vnc-pap-readiness
@@ -65,7 +65,7 @@ spec:
         - sdc-fe
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-sdc
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vnc-sdc-readiness
@@ -76,7 +76,7 @@ spec:
         - vid-server
         env:
         - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}-vid
+          value: {{ .Values.nsPrefix }}
         image: {{ .Values.image.readiness }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vnc-vid-readiness
@@ -86,11 +86,11 @@ spec:
         lifecycle:
           postStart:
             exec:
-              command: ["/bin/sh", "-c", "mkdir -p /root/.mozilla/firefox/onap.default; cp /root/.init_profile/profiles.ini /root/.mozilla/firefox/; echo 'user_pref(\"browser.tabs.remote.autostart.2\", false);' > /root/.mozilla/firefox/onap.default/prefs.js; (while true; do /tmp/update_hosts.sh sdc-be.{{ .Values.nsPrefix }}-sdc sdc.api.be.simpledemo.onap.org; /tmp/update_hosts.sh portalapps.{{ .Values.nsPrefix }}-portal portal.api.simpledemo.onap.org; /tmp/update_hosts.sh pap.{{ .Values.nsPrefix }}-policy policy.api.simpledemo.onap.org; /tmp/update_hosts.sh sdc-fe.{{ .Values.nsPrefix }}-sdc sdc.api.simpledemo.onap.org; /tmp/update_hosts.sh vid-server.{{ .Values.nsPrefix }}-vid vid.api.simpledemo.onap.org; /tmp/update_hosts.sh sparky-be.{{ .Values.nsPrefix }}-aai aai.api.simpledemo.onap.org; /tmp/update_hosts.sh cli.{{ .Values.nsPrefix }}-cli cli.api.simpledemo.onap.org; sleep 10; done)  > update_hosts.log 2>&1 &"]
+              command: ["/bin/sh", "-c", "mkdir -p /root/.mozilla/firefox/onap.default; cp /root/.init_profile/profiles.ini /root/.mozilla/firefox/; echo 'user_pref(\"browser.tabs.remote.autostart.2\", false);' > /root/.mozilla/firefox/onap.default/prefs.js; (while true; do /tmp/update_hosts.sh sdc-be.{{ .Values.nsPrefix }} sdc.api.be.simpledemo.onap.org; /tmp/update_hosts.sh portalapps.{{ .Values.nsPrefix }} portal.api.simpledemo.onap.org; /tmp/update_hosts.sh pap.{{ .Values.nsPrefix }} policy.api.simpledemo.onap.org; /tmp/update_hosts.sh sdc-fe.{{ .Values.nsPrefix }} sdc.api.simpledemo.onap.org; /tmp/update_hosts.sh vid-server.{{ .Values.nsPrefix }} vid.api.simpledemo.onap.org; /tmp/update_hosts.sh sparky-be.{{ .Values.nsPrefix }} aai.api.simpledemo.onap.org; /tmp/update_hosts.sh cli.{{ .Values.nsPrefix }} cli.api.simpledemo.onap.org; sleep 10; done)  > update_hosts.log 2>&1 &"]
         env:
         - name: VNC_PASSWORD
           value: password
-        name: vnc-portal
+        name: portal-vnc
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -110,10 +110,10 @@ spec:
             path: /etc/localtime
         - name: vnc-profiles-ini
           configMap:
-            name: vnc-profiles-ini
+            name: portal-vnc-profiles-ini
         - name: vnc-update-hosts
           configMap:
-            name: vnc-update-hosts
+            name: portal-vnc-update-hosts
             defaultMode: 0755
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"