diff options
Diffstat (limited to 'kubernetes/portal')
| -rwxr-xr-x | kubernetes/portal/templates/portal-apps-deployment.yaml | 68 | ||||
| -rwxr-xr-x | kubernetes/portal/templates/portal-mariadb-deployment.yaml | 26 | ||||
| -rw-r--r-- | kubernetes/portal/templates/portal-vnc-dep.yaml | 151 | ||||
| -rw-r--r-- | kubernetes/portal/templates/portal-widgets-deployment.yaml | 43 | ||||
| -rw-r--r-- | kubernetes/portal/values.yaml | 6 |
5 files changed, 102 insertions, 192 deletions
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 75977c7be0..761441acc3 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -13,49 +13,31 @@ spec: labels: app: portalapps name: portalapps - 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" - }, - { - "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" - }, - { - "mountPath": "/portal_root/", - "name": "portal-root" - } - ], - "image": "{{ .Values.image.mariadbClient }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "provision-portaldb-users" - } - ]' 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 + - mountPath: /portal_root/ + name: portal-root + image: {{ .Values.image.mariadbClient }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: provision-portaldb-users containers: - image: {{ .Values.image.portalapps }} imagePullPolicy: {{ .Values.pullPolicy }} @@ -160,4 +142,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index 96084e5294..fafcad2772 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -29,10 +29,6 @@ spec: readOnly: true - mountPath: /var/lib/mysql name: portal-mariadb-data - - mountPath: /var/log/onap - name: portal-logs - - mountPath: /tmp/logback.xml - name: portal-logback ports: - containerPort: 3306 name: portaldb @@ -41,16 +37,6 @@ spec: port: 3306 initialDelaySeconds: 5 periodSeconds: 10 - - image: {{ .Values.image.filebeat }} - imagePullPolicy: {{ .Values.pullPolicy }} - name: filebeat-onap - volumeMounts: - - mountPath: /usr/share/filebeat/filebeat.yml - name: filebeat-conf - - mountPath: /var/log/onap - name: portal-logs - - mountPath: /usr/share/filebeat/data - name: portal-data-filebeat volumes: - name: localtime hostPath: @@ -58,16 +44,6 @@ spec: - name: portal-mariadb-data persistentVolumeClaim: claimName: portal-db - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: portal-logs - emptyDir: {} - - name: portal-data-filebeat - emptyDir: {} - - name: portal-logback - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index b4a9effe59..8d49bb2a27 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -15,100 +15,63 @@ spec: labels: app: vnc-portal name: vnc-portal - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "portalapps" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vnc-portal-readiness" - }, - { - "args": [ - "--container-name", - "pap" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "value": "{{ .Values.nsPrefix }}-policy" - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vnc-pap-readiness" - }, - { - "args": [ - "--container-name", - "sdc-fe" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "value": "{{ .Values.nsPrefix }}-sdc" - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vnc-sdc-readiness" - }, - { - "args": [ - "--container-name", - "vid-server" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "value": "{{ .Values.nsPrefix }}-vid" - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vnc-vid-readiness" - }, - { - "command": ["/bin/sh","-c"], - "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.onap.org >> /ubuntu-init/hosts"], - "image": "{{ .Values.image.ubuntuInit }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "vnc-init-hosts", - "volumeMounts": [ - { - "name": "ubuntu-init", - "mountPath": "/ubuntu-init/" - } - ] - } - ]' 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: vnc-portal-readiness + - command: + - /root/ready.py + args: + - --container-name + - pap + env: + - name: NAMESPACE + value: {{ .Values.nsPrefix }}-policy + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vnc-pap-readiness + - command: + - /root/ready.py + args: + - --container-name + - sdc-fe + env: + - name: NAMESPACE + value: {{ .Values.nsPrefix }}-sdc + 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 }}-vid + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vnc-vid-readiness + - command: ["/bin/sh","-c"] + args: ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.onap.org >> /ubuntu-init/hosts"] + image: {{ .Values.image.ubuntuInit }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vnc-init-hosts + volumeMounts: + - name: ubuntu-init + mountPath: /ubuntu-init/ containers: - image: {{ .Values.image.ubuntuDesktop }} imagePullPolicy: {{ .Values.pullPolicy }} @@ -137,4 +100,4 @@ spec: emptyDir: {} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml index 865d84523f..600419399e 100644 --- a/kubernetes/portal/templates/portal-widgets-deployment.yaml +++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml @@ -13,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 }} @@ -66,4 +55,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index a5edb98329..aaa781995a 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -3,10 +3,10 @@ pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 - portalapps: nexus3.onap.org:10001/onap/portal-apps:1.3-STAGING-latest - portaldb: nexus3.onap.org:10001/onap/portal-db:1.3-STAGING-latest + portalapps: nexus3.onap.org:10001/onap/portal-apps:v1.3.0 + portaldb: nexus3.onap.org:10001/onap/portal-db:v1.3.0 mariadbClient: oomk8s/mariadb-client-init:1.0.0 - portalwms: nexus3.onap.org:10001/onap/portal-wms:1.3-STAGING-latest + portalwms: nexus3.onap.org:10001/onap/portal-wms:v1.3.0 ubuntuInit: oomk8s/ubuntu-init:1.0.0 ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc filebeat: docker.elastic.co/beats/filebeat:5.5.0 |