Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Harmonize all component ingress config
[oom.git]
/
kubernetes
/
portal
/
components
/
portal-app
/
values.yaml
diff --git
a/kubernetes/portal/components/portal-app/values.yaml
b/kubernetes/portal/components/portal-app/values.yaml
index
bd1ed58
..
483a7f3
100644
(file)
--- a/
kubernetes/portal/components/portal-app/values.yaml
+++ b/
kubernetes/portal/components/portal-app/values.yaml
@@
-20,10
+20,6
@@
global:
env:
tomcatDir: "/usr/local/tomcat"
nodePortPrefix: 302
env:
tomcatDir: "/usr/local/tomcat"
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- envsubstImage: dibi/envsubst
#AAF service
aafEnabled: true
#AAF service
aafEnabled: true
@@
-55,8
+51,7
@@
secrets:
#################################################################
# application image
#################################################################
# application image
-repository: nexus3.onap.org:10001
-image: onap/portal-app:3.2.3
+image: onap/portal-app:3.4.2
pullPolicy: Always
# application configuration
pullPolicy: Always
# application configuration
@@
-82,10
+77,9
@@
certInitializer:
permission_group: 999
keystoreFile: "org.onap.portal.p12"
truststoreFile: "org.onap.portal.trust.jks"
permission_group: 999
keystoreFile: "org.onap.portal.p12"
truststoreFile: "org.onap.portal.trust.jks"
- aaf_add_config: >
- /opt/app/aaf_config/bin/agent.sh;
- /opt/app/aaf_config/bin/agent.sh local showpass \
- {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
+ aaf_add_config: |
+ echo "cadi_truststore_password=$cadi_truststore_password" > {{ .Values.credsPath }}/mycreds.prop
+ echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" >> {{ .Values.credsPath }}/mycreds.prop
# default number of instances
replicaCount: 1
# default number of instances
replicaCount: 1
@@
-147,9
+141,10
@@
messageRouter:
ingress:
enabled: false
service:
ingress:
enabled: false
service:
- - baseaddr: portal
.ap
i
+ - baseaddr: portal
-u
i
name: "portal-app"
port: 8443
name: "portal-app"
port: 8443
+ plain_port: 8080
config:
ssl: "redirect"
config:
ssl: "redirect"
@@
-172,3
+167,13
@@
resources:
cpu: 2
memory: 8Gi
unlimited: {}
cpu: 2
memory: 8Gi
unlimited: {}
+
+# Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
+#Pods Service Account
+serviceAccount:
+ nameOverride: portal-app
+ roles:
+ - read