X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Fcomponents%2Fportal-app%2Fvalues.yaml;h=483a7f3568391f6f77b1039f658c0880b5e475a5;hb=c48f93d37477327de237374816683aa19275befc;hp=bd1ed585ada0ab6c33a402188547faa78da674e4;hpb=ab7230ea90109edf7cb0c8b1ced2808f9f81ddb1;p=oom.git diff --git a/kubernetes/portal/components/portal-app/values.yaml b/kubernetes/portal/components/portal-app/values.yaml index bd1ed585ad..483a7f3568 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.2.3 +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 @@ -147,9 +141,10 @@ messageRouter: ingress: enabled: false service: - - baseaddr: portal.api + - baseaddr: portal-ui name: "portal-app" port: 8443 + plain_port: 8080 config: ssl: "redirect" @@ -172,3 +167,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