X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Ftemplates%2Fportal-widgets-deployment.yaml;h=600419399e898abaf4c2cc76ccb4e873bea09f77;hb=8db8b1825e199e295a2429c450d6cc9f5825c2e1;hp=fb6b4d871241298c4860efc0883713c7afbfd10d;hpb=8693163137415a61788a3e8ed38e24d727286b21;p=oom.git diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml index fb6b4d8712..600419399e 100644 --- a/kubernetes/portal/templates/portal-widgets-deployment.yaml +++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePortalPortalwidgets }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -12,33 +13,22 @@ spec: labels: app: portalwidgets name: portalwidgets - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "portaldb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "portalapps-readiness" - } - ]' 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 }} @@ -62,6 +52,7 @@ spec: path: /etc/localtime - name: portalwidgets-application-properties hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }}