X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Fcomponents%2Fportal-app%2Fvalues.yaml;h=039f56016ed7db06b8d7bd4c3ed4273fb838a61c;hb=e4aac7a3c577b7bb9eaae93387d482f952ee4b72;hp=3f55f4a08e479ed31633f9c4d2fbaf8e12757a6e;hpb=a8934e9feb874baf84a3dba697013d429e04f921;p=oom.git diff --git a/kubernetes/portal/components/portal-app/values.yaml b/kubernetes/portal/components/portal-app/values.yaml index 3f55f4a08e..039f56016e 100644 --- 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 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - envsubstImage: dibi/envsubst #AAF service aafEnabled: true @@ -55,8 +51,7 @@ secrets: ################################################################# # application image -repository: nexus3.onap.org:10001 -image: onap/portal-app:3.4.1 +image: onap/portal-app:3.4.2 pullPolicy: Always # application configuration @@ -82,10 +77,9 @@ certInitializer: 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 @@ -172,3 +166,13 @@ resources: 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