summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/templates
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/portal/templates')
-rw-r--r--kubernetes/portal/templates/all-services.yaml11
-rwxr-xr-xkubernetes/portal/templates/portal-apps-deployment.yaml6
-rwxr-xr-xkubernetes/portal/templates/portal-mariadb-deployment.yaml6
-rw-r--r--kubernetes/portal/templates/portal-pv-pvc.yaml6
-rw-r--r--kubernetes/portal/templates/portal-vnc-dep.yaml6
-rw-r--r--kubernetes/portal/templates/portal-widgets-deployment.yaml6
6 files changed, 38 insertions, 3 deletions
diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml
index b3fabb2932..b819b1c5e3 100644
--- a/kubernetes/portal/templates/all-services.yaml
+++ b/kubernetes/portal/templates/all-services.yaml
@@ -20,6 +20,17 @@ metadata:
app: portalapps
name: portalapps
namespace: "{{ .Values.nsPrefix }}-portal"
+ annotations:
+ msb.onap.org/service-info: '[
+ {
+ "serviceName": "portal",
+ "version": "v2",
+ "url": "/",
+ "protocol": "REST"
+ "port": "8989",
+ "visualRange":"1"
+ }
+ ]'
spec:
ports:
- name: portal-1
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index c6078678cd..2048a694f2 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -64,6 +64,9 @@ spec:
command: ["/bin/sh", "-c", "echo yes > /portal_root/boot.txt"]
name: portalapps
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties"
name: portal-fusion-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties"
@@ -102,6 +105,9 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: portal-fusion-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index 16c0d7e6d2..f4e46ab062 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -23,6 +23,9 @@ spec:
- name: MYSQL_ROOT_PASSWORD
value: password
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /var/lib/mysql
name: portal-mariadb-data
ports:
@@ -34,6 +37,9 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: portal-mariadb-data
persistentVolumeClaim:
claimName: portal-db
diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml
index 5d41e4febe..11b3dbb4e1 100644
--- a/kubernetes/portal/templates/portal-pv-pvc.yaml
+++ b/kubernetes/portal/templates/portal-pv-pvc.yaml
@@ -1,10 +1,10 @@
apiVersion: v1
kind: PersistentVolume
metadata:
- name: portal-db
+ name: "{{ .Values.nsPrefix }}-portal-db"
namespace: "{{ .Values.nsPrefix }}-portal"
labels:
- name: portal-db
+ name: "{{ .Values.nsPrefix }}-portal-db"
spec:
capacity:
storage: 2Gi
@@ -27,4 +27,4 @@ spec:
storage: 2Gi
selector:
matchLabels:
- name: portal-db
+ name: "{{ .Values.nsPrefix }}-portal-db"
diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
index 6c90bbfa17..075b1f19e0 100644
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -120,12 +120,18 @@ spec:
value: password
name: vnc-portal
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /ubuntu-init/
name: ubuntu-init
securityContext:
privileged: true
securityContext: {}
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: ubuntu-init
emptyDir: {}
imagePullSecrets:
diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
index 5b020e5865..fb6b4d8712 100644
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -44,6 +44,9 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy }}
name: portalwidgets
volumeMounts:
+ - mountPath: /etc/localtime
+ name: localtime
+ readOnly: true
- mountPath: /application.properties
name: portalwidgets-application-properties
ports:
@@ -54,6 +57,9 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
volumes:
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
- name: portalwidgets-application-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties