aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuryn <Yury.Novitsky@Amdocs.com>2017-12-21 14:31:21 +0200
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-01-03 14:24:57 +0000
commitde049024ceac6dfe48c8e4d06464c419569b61d7 (patch)
tree5af2ea3c6569ad80d93a3420c0bbcc3ac29d1c94
parent3122a3ae5119db143d107c060fa6131db539d65a (diff)
Fix firefox tab crashes in VNC
Change-Id: Ie295257d98ddf32693309535e15c6ad9529f10fc Issue-ID: OOM-531 Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
-rw-r--r--kubernetes/portal/resources/vnc/init_profile/profiles.ini9
-rw-r--r--kubernetes/portal/templates/portal-vnc-dep.yaml15
2 files changed, 23 insertions, 1 deletions
diff --git a/kubernetes/portal/resources/vnc/init_profile/profiles.ini b/kubernetes/portal/resources/vnc/init_profile/profiles.ini
new file mode 100644
index 0000000000..7a1330fb4d
--- /dev/null
+++ b/kubernetes/portal/resources/vnc/init_profile/profiles.ini
@@ -0,0 +1,9 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=onap.default
+Default=1
+
diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
index 8d49bb2a27..536ac37396 100644
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -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 }}