Fix firefox tab crashes in VNC 19/26719/2
authoryuryn <Yury.Novitsky@Amdocs.com>
Thu, 21 Dec 2017 12:31:21 +0000 (14:31 +0200)
committerAlexis de Talhouët <alexis.de_talhouet@bell.ca>
Wed, 3 Jan 2018 14:24:57 +0000 (14:24 +0000)
Change-Id: Ie295257d98ddf32693309535e15c6ad9529f10fc
Issue-ID: OOM-531
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
kubernetes/portal/resources/vnc/init_profile/profiles.ini [new file with mode: 0644]
kubernetes/portal/templates/portal-vnc-dep.yaml

diff --git a/kubernetes/portal/resources/vnc/init_profile/profiles.ini b/kubernetes/portal/resources/vnc/init_profile/profiles.ini
new file mode 100644 (file)
index 0000000..7a1330f
--- /dev/null
@@ -0,0 +1,9 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=onap.default
+Default=1
+
index 8d49bb2..536ac37 100644 (file)
@@ -1,4 +1,11 @@
 #{{ if not .Values.disablePortalVncPortal }}
+kind: ConfigMap
+metadata:
+  name: vnc-profiles-ini
+  namespace: "{{ .Values.nsPrefix }}-portal"
+data:
+{{ (.Files.Glob "resources/vnc/init_profile/profiles.ini").AsConfig | indent 2 }}
+---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -78,7 +85,7 @@ spec:
         lifecycle:
           postStart:
             exec:
-              command: ["/bin/sh", "-c", "cat /ubuntu-init/hosts >> /etc/hosts"]
+              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; cat /ubuntu-init/hosts >> /etc/hosts"]
         env:
         - name: VNC_PASSWORD
           value: password
@@ -89,6 +96,9 @@ spec:
           readOnly: true
         - mountPath: /ubuntu-init/
           name: ubuntu-init
+        - mountPath: /root/.init_profile/profiles.ini
+          name: vnc-profiles-ini
+          subPath: profiles.ini
         securityContext:
           privileged: true
       securityContext: {}
@@ -98,6 +108,9 @@ spec:
             path: /etc/localtime
         - name: ubuntu-init
           emptyDir: {}
+        - name: vnc-profiles-ini
+          configMap:
+            name: vnc-profiles-ini
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}