diff options
Diffstat (limited to 'kubernetes/portal/templates')
-rw-r--r-- | kubernetes/portal/templates/all-services.yaml | 10 | ||||
-rwxr-xr-x | kubernetes/portal/templates/portal-mariadb-deployment.yaml | 4 | ||||
-rw-r--r-- | kubernetes/portal/templates/portal-pv-pvc.yaml | 30 | ||||
-rw-r--r-- | kubernetes/portal/templates/portal-vnc-dep.yaml | 2 |
4 files changed, 38 insertions, 8 deletions
diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml index 2107e2a30b..b3fabb2932 100644 --- a/kubernetes/portal/templates/all-services.yaml +++ b/kubernetes/portal/templates/all-services.yaml @@ -23,15 +23,15 @@ metadata: spec: ports: - name: portal-1 - nodePort: 30213 + nodePort: {{ .Values.nodePortPrefix }}13 port: 8006 targetPort: 8005 - name: portal-2 - nodePort: 30214 + nodePort: {{ .Values.nodePortPrefix }}14 port: 8010 targetPort: 8009 - name: portal-3 - nodePort: 30215 + nodePort: {{ .Values.nodePortPrefix }}15 port: 8989 targetPort: 8080 selector: @@ -50,11 +50,11 @@ spec: - name: tcp-1 port: 6080 targetPort: 80 - nodePort: 30211 + nodePort: {{ .Values.nodePortPrefix }}11 - name: tcp-2 port: 5900 targetPort: 5900 - nodePort: 30212 + nodePort: {{ .Values.nodePortPrefix }}12 selector: app: vnc-portal type: NodePort diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index a31c6a24b2..16c0d7e6d2 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -35,7 +35,7 @@ spec: periodSeconds: 10 volumes: - name: portal-mariadb-data - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data + persistentVolumeClaim: + claimName: portal-db imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml new file mode 100644 index 0000000000..5d41e4febe --- /dev/null +++ b/kubernetes/portal/templates/portal-pv-pvc.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: portal-db + namespace: "{{ .Values.nsPrefix }}-portal" + labels: + name: portal-db +spec: + capacity: + storage: 2Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data +--- +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: portal-db + namespace: "{{ .Values.nsPrefix }}-portal" +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 2Gi + selector: + matchLabels: + name: portal-db diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index fb7bd93e44..6c90bbfa17 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -95,7 +95,7 @@ spec: }, { "command": ["/bin/sh","-c"], - "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"], + "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"], "image": "{{ .Values.image.ubuntuInit }}", "imagePullPolicy": "{{ .Values.pullPolicy }}", "name": "vnc-init-hosts", |