summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/portal')
-rw-r--r--kubernetes/portal/all-services.yaml14
-rwxr-xr-xkubernetes/portal/portal-apps-deployment.yaml38
-rwxr-xr-xkubernetes/portal/portal-mariadb-deployment.yaml2
-rw-r--r--kubernetes/portal/portal-vnc-dep.yaml2
-rw-r--r--kubernetes/portal/portal-widgets-deployment.yaml57
5 files changed, 97 insertions, 16 deletions
diff --git a/kubernetes/portal/all-services.yaml b/kubernetes/portal/all-services.yaml
index cb7c9e2099..0cb5947535 100644
--- a/kubernetes/portal/all-services.yaml
+++ b/kubernetes/portal/all-services.yaml
@@ -55,3 +55,17 @@ spec:
selector:
app: vnc-portal
type: NodePort
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: portalwidgets
+ labels:
+ app: portalwidgets
+spec:
+ ports:
+ - name: portalwidgets
+ port: 8082
+ selector:
+ app: portalwidgets
+ clusterIP: None
diff --git a/kubernetes/portal/portal-apps-deployment.yaml b/kubernetes/portal/portal-apps-deployment.yaml
index 39f32caa47..c9ed3e7a6a 100755
--- a/kubernetes/portal/portal-apps-deployment.yaml
+++ b/kubernetes/portal/portal-apps-deployment.yaml
@@ -37,10 +37,10 @@ spec:
"name": "portalapps-readiness"
},
{
- "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/Apps_Users_OnBoarding_Script.sql; fi"],
+ "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/oom_updates.sql; fi"],
"volumeMounts": [
{
- "mountPath": "/portal-mysql/Apps_Users_OnBoarding_Script.sql",
+ "mountPath": "/portal-mysql/oom_updates.sql",
"name": "portal-mariadb-onboarding-sql"
},
{
@@ -55,35 +55,39 @@ spec:
]'
spec:
containers:
- - image: nexus3.onap.org:10001/openecomp/portalapps:1.0-STAGING-latest
+ - image: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
lifecycle:
postStart:
exec:
command: ["/bin/sh", "-c", "echo yes > /portal_root/boot.txt"]
name: portalapps
volumeMounts:
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/fusion/conf/fusion.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties
name: portal-fusion-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/classes/openid-connect.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties
name: portal-openid-connect-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/conf/system.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/conf/system.properties
name: portal-system-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/classes/portal.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/portal.properties
name: portal-portal-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/fusion/fusion.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties
name: dbcapp-fusion-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/conf/system.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/conf/system.properties
name: dbcapp-system-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/classes/portal.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/classes/portal.properties
name: dbcapp-portal-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties
name: dbcapp-dbcapp-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/conf/system.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/conf/system.properties
name: sdkapp-system-properties
- - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/classes/portal.properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/classes/portal.properties
name: sdkapp-portal-properties
+ - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties
+ name: sdkapp-fusion-properties
- mountPath: /portal_root/
name: portal-root
+ - mountPath: /opt/apache-tomcat-8.0.37/logs
+ name: portal-logs
ports:
- containerPort: 8005
- containerPort: 8009
@@ -124,11 +128,17 @@ spec:
- name: sdkapp-portal-properties
hostPath:
path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+ - name: sdkapp-fusion-properties
+ hostPath:
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
- name: portal-mariadb-onboarding-sql
hostPath:
- path: /dockerdata-nfs/onapdemo/portal/mariadb/Apps_Users_OnBoarding_Script.sql
+ path: /dockerdata-nfs/onapdemo/portal/mariadb/oom_updates.sql
- name: portal-root
hostPath:
path: /dockerdata-nfs/onapdemo/portal
+ - name: portal-logs
+ hostPath:
+ path: /dockerdata-nfs/onapdemo/portal/logs
imagePullSecrets:
- name: onap-docker-registry-key
diff --git a/kubernetes/portal/portal-mariadb-deployment.yaml b/kubernetes/portal/portal-mariadb-deployment.yaml
index f1dae14017..42481fd8b4 100755
--- a/kubernetes/portal/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/portal-mariadb-deployment.yaml
@@ -13,7 +13,7 @@ spec:
name: portaldb
spec:
containers:
- - image: nexus3.onap.org:10001/openecomp/portaldb:1.0-STAGING-latest
+ - image: nexus3.onap.org:10001/openecomp/portaldb:1.1-STAGING-latest
name: "portaldb"
env:
- name: MYSQL_HOST
diff --git a/kubernetes/portal/portal-vnc-dep.yaml b/kubernetes/portal/portal-vnc-dep.yaml
index 7751eeeaab..f475865ee6 100644
--- a/kubernetes/portal/portal-vnc-dep.yaml
+++ b/kubernetes/portal/portal-vnc-dep.yaml
@@ -94,7 +94,7 @@ spec:
},
{
"command": ["/bin/sh","-c"],
- "args": ["echo `host sdc-be.onap-sdc | awk ''{print$4}''` sdc.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.onap-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.onap-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.onap-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.onap-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"],
+ "args": ["echo `host sdc-be.onap-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.onap-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.onap-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.onap-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.onap-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.onap-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"],
"image": "oomk8s/ubuntu-init:1.0.0",
"imagePullPolicy": "Always",
"name": "vnc-init-hosts",
diff --git a/kubernetes/portal/portal-widgets-deployment.yaml b/kubernetes/portal/portal-widgets-deployment.yaml
new file mode 100644
index 0000000000..e170313a1e
--- /dev/null
+++ b/kubernetes/portal/portal-widgets-deployment.yaml
@@ -0,0 +1,57 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: portalwidgets
+spec:
+ selector:
+ matchLabels:
+ app: portalwidgets
+ template:
+ metadata:
+ 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": "oomk8s/readiness-check:1.0.0",
+ "imagePullPolicy": "Always",
+ "name": "portalapps-readiness"
+ }
+ ]'
+ spec:
+ containers:
+ - image: nexus3.onap.org:10001/openecomp/portalwms:1.1-STAGING-latest
+ name: portalwidgets
+ volumeMounts:
+ - mountPath: /application.properties
+ name: portalwidgets-application-properties
+ ports:
+ - containerPort: 8082
+ readinessProbe:
+ tcpSocket:
+ port: 8082
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ volumes:
+ - name: portalwidgets-application-properties
+ hostPath:
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties