aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-09-18 22:49:14 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-18 22:49:14 +0000
commit68e63a8ec4794aa297de5131ff919a330b2f564c (patch)
treebe3650cef1cd2d1f1cfcc0b96223b77ffb636972
parentecb82cb18c9560686dd3477a1b05d470464d4636 (diff)
parent6778510553d60d051f857838ae428d964a5b1e59 (diff)
Merge "Updated SDK deployment.yaml"
-rw-r--r--kubernetes/portal/charts/portal-app/values.yaml2
-rw-r--r--kubernetes/portal/charts/portal-mariadb/values.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/templates/deployment.yaml2
-rw-r--r--kubernetes/portal/charts/portal-sdk/values.yaml2
-rw-r--r--kubernetes/portal/charts/portal-widget/values.yaml2
5 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index aa8951c083..8d9cee0d4e 100644
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -28,7 +28,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-app:2.5.0
+image: onap/portal-app:2.6.0
pullPolicy: Always
# default number of instances
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index 23debfd2ba..e6896f17c1 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -24,7 +24,7 @@ global: # global defaults
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-db:2.5.0
+image: onap/portal-db:2.6.0
pullPolicy: Always
readinessImage: readiness-check:2.0.0
diff --git a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml b/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
index f59a16a671..736afac21c 100644
--- a/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-sdk/templates/deployment.yaml
@@ -52,6 +52,8 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /start-apache-tomcat.sh
+ - -b
+ - "{{ .Values.global.env.tomcatDir }}"
ports:
- containerPort: {{ .Values.service.internalPort }}
{{- if eq .Values.liveness.enabled true }}
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index be5d8aeeee..4a0124d7a5 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -28,7 +28,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-sdk:2.5.0
+image: onap/portal-sdk:2.6.0
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/portal/charts/portal-widget/values.yaml b/kubernetes/portal/charts/portal-widget/values.yaml
index 62e095db1c..37f4294fb4 100644
--- a/kubernetes/portal/charts/portal-widget/values.yaml
+++ b/kubernetes/portal/charts/portal-widget/values.yaml
@@ -29,7 +29,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/portal-wms:2.5.0
+image: onap/portal-wms:2.6.0
pullPolicy: Always
# flag to enable debugging - application support required