Standardizing ONAP Portal

-synched up with Beijing (master)
-pods come up without cassandra music:
sed: couldn't edit /docker-entrypoint-initdb.d/\
zzz_portal.cql: not a regular file

ONAPPORTAL webapp in tomcat is failing to star
resulting in HTTP 404 robot health

Not sure how logging works in beijing so removed
some of the ubuntu-init dir creation.  need someone
familiar with logging to investigate

-addressed some CI comments.
-removing configmap now that portaldb was fixed

Issue-ID: OOM-746

Change-Id: I123d1ec6889db40b1721475a43665ef8efefc057
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>

8 files changed, 2 insertions, 665 deletions

diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
deleted file mode 100644
index d6958fcc6d..0000000000
--- a/kubernetes/portal/templates/all-services.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disablePortalPortaldb }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: portaldb
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: portaldb
-spec:
-  ports:
-  - name: portaldb
-    port: 3306
-  selector:
-    app: portaldb
-  clusterIP: None
-#{{ end }}
-#{{ if not .Values.disablePortalPortalapps }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: portalapps
-  name: portalapps
-  namespace: "{{ .Values.nsPrefix }}"
-  annotations:
-    msb.onap.org/service-info: '[
-      {
-          "serviceName": "portal",
-          "version": "v2",
-          "url": "/",
-          "protocol": "REST"
-          "port": "8989",
-          "visualRange":"1"
-      }
-      ]'
-spec:
-  ports:
-  - name: portal-1
-    nodePort: {{ .Values.nodePortPrefix }}13
-    port: 8006
-    targetPort: 8005
-  - name: portal-2
-    nodePort: {{ .Values.nodePortPrefix }}14
-    port: 8010
-    targetPort: 8009
-  - name: portal-3
-    nodePort: {{ .Values.nodePortPrefix }}15
-    port: 8989
-    targetPort: 8080
-  selector:
-    app: portalapps
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disablePortalVncPortal }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: portal-vnc
-  name: portal-vnc
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  ports:
-  - name: tcp-1
-    port: 6080
-    targetPort: 80
-    nodePort: {{ .Values.nodePortPrefix }}11
-  - name: tcp-2
-    port: 5900
-    targetPort: 5900
-    nodePort: {{ .Values.nodePortPrefix }}12
-  selector:
-    app: portal-vnc
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disablePortalPortalwidgets }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: portalwidgets
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: portalwidgets
-spec:
-  ports:
-  - name: portalwidgets
-    port: 8082
-  selector:
-    app: portalwidgets
-  clusterIP: None
-#{{ end }}
diff --git a/kubernetes/portal/templates/portal-logs-configmap.yaml b/kubernetes/portal/templates/configmap.yaml
index 068adadbdb..8eea1912ac 100644
--- a/kubernetes/portal/templates/portal-logs-configmap.yaml
+++ b/kubernetes/portal/templates/configmap.yaml
@@ -12,29 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#{{ if not .Values.disablePortalPortalapps }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: portal-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}
+  name: portal-filebeat
+  namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/filebeat.yml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onapportal-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/portal/onapportal/logback.xml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onapportalsdk-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/portal/onapportalsdk/logback.xml").AsConfig . | indent 2 }}
-#{{ end }}
 
diff --git a/kubernetes/portal/templates/portal-apps-configmap.yaml b/kubernetes/portal/templates/portal-apps-configmap.yaml
deleted file mode 100644
index ee5e4b8059..0000000000
--- a/kubernetes/portal/templates/portal-apps-configmap.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disablePortalPortalapps }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onap-portal-sdk-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onap-portal-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTAL/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-mariadb-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/mariadb/oom_updates.sql").AsConfig . | indent 2 }}
-#{{ end }}
----
-#{{ if not .Values.disablePortalPortalwidgets }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onapwidgetms-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties").AsConfig . | indent 2 }}
-#{{ end }}
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
deleted file mode 100644
index ccd086caf5..0000000000
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disablePortalPortalapps }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: portal-apps
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.portalAppsReplicas }}
-  selector:
-    matchLabels:
-      app: portalapps
-  template:
-    metadata:
-       labels:
-         app: portalapps
-       name: portal-apps
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - portaldb
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: portalapps-readiness
-      - command: ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"]
-        volumeMounts:
-        - mountPath: /portal-mysql/oom_updates.sql
-          name: portal-mariadb-onboarding-sql
-          subPath: oom_updates.sql
-        - mountPath: /portal_root/
-          name: portal-root
-        image: {{ .Values.image.mariadbClient }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: provision-portaldb-users
-      - command: ["/bin/bash", "-c", "mkdir -p /ubuntu-init/ && chmod -R 777 /ubuntu-init/"]
-        volumeMounts:
-        - name: portal-logs
-          mountPath: /ubuntu-init/
-        image: {{ .Values.image.ubuntuInit }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: portal-app-logs-init
-      containers:
-      - image: {{ .Values.image.portalapps }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/bin/sh", "-c", "echo yes > /portal_root/boot.txt"]
-        name: portalapps
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/fusion/conf/fusion.properties"
-          name: onap-portal-properties
-          subPath: fusion.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/openid-connect.properties"
-          name: onap-portal-properties
-          subPath: openid-connect.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/conf/system.properties"
-          name: onap-portal-properties
-          subPath: system.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/portal.properties"
-          name: onap-portal-properties
-          subPath: portal.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/logback.xml"
-          name: portal-logback
-          subPath: logback.xml
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/conf/system.properties"
-          name: portal-sdkapp-properties
-          subPath: system.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/classes/portal.properties"
-          name: portal-sdkapp-properties
-          subPath: portal.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/fusion/conf/fusion.properties"
-          name: portal-sdkapp-properties
-          subPath: fusion.properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/classes/logback.xml"
-          name: sdkapp-logback
-          subPath: logback.xml
-        - mountPath: /portal_root/
-          name: portal-root
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs"
-          name: portal-logs
-        - mountPath: /var/log/onap
-          name: portal-logs2
-        ports:
-        - containerPort: 8005
-        - containerPort: 8009
-        - containerPort: 8080
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      - image: {{ .Values.image.filebeat }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: filebeat-onap
-        volumeMounts:
-        - mountPath: /usr/share/filebeat/filebeat.yml
-          name: filebeat-conf
-          subPath: filebeat.yml
-        - mountPath: /var/log/onap
-          name: portal-logs2
-        - mountPath: /usr/share/filebeat/data
-          name: portal-data-filebeat
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: filebeat-conf
-          configMap:
-            name: portal-filebeat-configmap
-        - name: portal-logs2
-          emptyDir: {}
-        - name: portal-data-filebeat
-          emptyDir: {}
-        - name: onap-portal-properties
-          configMap:
-            defaultMode: 0755
-            name: portal-onap-portal-configmap
-        - name: portal-sdkapp-properties
-          configMap:
-            defaultMode: 0755
-            name: portal-onap-portal-sdk-configmap
-        - name: portal-logback
-          configMap:
-            name: portal-onapportal-log-configmap
-        - name: sdkapp-logback
-          configMap:
-            name: portal-onapportalsdk-log-configmap
-        - name: portal-mariadb-onboarding-sql
-          configMap:
-            name: portal-mariadb-configmap
-        - name: portal-root
-          hostPath:
-            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal
-        - name: portal-logs
-          hostPath:
-            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal/logs
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
deleted file mode 100644
index e1158a2461..0000000000
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disablePortalPortaldb }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: portal-db
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.portalDbReplicas }}
-  selector:
-    matchLabels:
-      app: portaldb
-  template:
-    metadata:
-      labels:
-        app: portaldb
-      name: portal-db
-    spec:
-      containers:
-      - image: {{ .Values.image.portaldb}}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: "portaldb"
-        env:
-        - name: MYSQL_HOST
-          value: "portaldb.{{ .Values.nsPrefix }}"
-        - name: MYSQL_ROOT_PASSWORD
-          value: Aa123456
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-        - mountPath: /var/lib/mysql
-          name: portal-mariadb-data
-        ports:
-        - containerPort: 3306
-          name: portaldb
-        readinessProbe:
-          tcpSocket:
-            port: 3306
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
-      - name: portal-mariadb-data
-        persistentVolumeClaim:
-          claimName: portal-db
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml
deleted file mode 100644
index 1ba5fbb5ea..0000000000
--- a/kubernetes/portal/templates/portal-pv-pvc.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-#{{ if not .Values.disablePortalPortaldb }}
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: "{{ .Values.nsPrefix }}-portal"
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    name: "{{ .Values.nsPrefix }}-portal"
-spec:
-  capacity:
-    storage: 2Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  hostPath:
-    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal/mariadb/data
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: portal-db
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 2Gi
-  selector:
-    matchLabels:
-      name: "{{ .Values.nsPrefix }}-portal"
-#{{ end }}
diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
deleted file mode 100644
index f3418e7bb8..0000000000
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disablePortalVncPortal }}
-kind: ConfigMap
-metadata:
-  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: portal-vnc-update-hosts
-  namespace: "{{ .Values.nsPrefix }}"
-data:
-{{ (.Files.Glob "resources/scripts/update_hosts.sh").AsConfig | indent 2 }}
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    app: portal-vnc
-  name: portal-vnc
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.vncPortalReplicas }}
-  selector:
-    matchLabels:
-      app: portal-vnc
-  template:
-    metadata:
-      labels:
-        app: portal-vnc
-      name: portal-vnc
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - portalapps
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: portal-vnc-readiness
-{{- if empty .Values.disablePolicyPap  | not }}
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - pap
-        env:
-        - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: vnc-pap-readiness
-{{- end }}
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - sdc-fe
-        env:
-        - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: vnc-sdc-readiness
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - vid-server
-        env:
-        - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: vnc-vid-readiness
-      containers:
-      - image: {{ .Values.image.ubuntuDesktop }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        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.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: portal-vnc
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-        - mountPath: /root/.init_profile/profiles.ini
-          name: vnc-profiles-ini
-          subPath: profiles.ini
-        - mountPath: /tmp/update_hosts.sh
-          name: vnc-update-hosts
-          subPath: update_hosts.sh
-        securityContext:
-          privileged: true
-      securityContext: {}
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: vnc-profiles-ini
-          configMap:
-            name: portal-vnc-profiles-ini
-        - name: vnc-update-hosts
-          configMap:
-            name: portal-vnc-update-hosts
-            defaultMode: 0755
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-
diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
deleted file mode 100644
index 1b6669e64f..0000000000
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disablePortalPortalwidgets }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: portal-widgets
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.portalWidgetsReplicas }}
-  selector:
-    matchLabels:
-      app: portalwidgets
-  template:
-    metadata:
-       labels:
-         app: portalwidgets
-       name: portal-widgets
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - portaldb
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: portalapps-readiness
-      containers:
-      - image: {{ .Values.image.portalwms }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: portalwidgets
-        volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
-        - mountPath: /application.properties
-          name: portalwidgets-application-properties
-          subPath: application.properties
-        ports:
-        - containerPort: 8082
-        readinessProbe:
-          tcpSocket:
-            port: 8082
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: portalwidgets-application-properties
-          configMap:
-            name: portal-onapwidgetms-configmap
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}