X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fnetwork-name-gen%2Fvalues.yaml;h=e5e2a7a33825b6518238df8c71d14569843c90f0;hb=96397bc43da6d39d8cc85767974d7c8fc9d08467;hp=a9f2a5bbd4523ff6327a0bfa171522908635b370;hpb=f7591a5a90a005e825fddb4de73da62d55d6cb70;p=oom.git diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index a9f2a5bbd4..e5e2a7a338 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -21,14 +21,6 @@ global: # with other instances running within the same k8s cluster nodePortPrefix: 302 - # image repositories - repository: nexus3.onap.org:10001 - - - # readiness check - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 - # image pull policy pullPolicy: IfNotPresent @@ -44,17 +36,25 @@ global: ################################################################# secrets: - uid: neng-db-secret - name: '{{ include "common.release" . }}-neng-db-secret' + name: &dbUserSecretName '{{ include "common.release" . }}-neng-db-secret' type: basicAuth - externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}' + externalSecret: '{{ tpl (default "" .Values.config.db.externalSecret) . }}' login: '{{ .Values.config.db.userName }}' password: '{{ .Values.config.db.userPassword }}' + - uid: pol-basic-auth-secret + name: '{{ include "common.release" . }}-pol-basic-auth-secret' + type: basicAuth + externalSecret: '{{ tpl (default "" .Values.config.polBasicAuthSecret) . }}' + login: '{{ .Values.config.polBasicAuthUser }}' + password: '{{ .Values.config.polBasicAuthPassword }}' # sub-chart config mariadb-galera: - config: &mariadbConfig - userCredentialsExternalSecret: '{{ include "common.release" . }}-neng-db-secret' - mysqlDatabase: nengdb + db: + user: sdnctl + # password: + externalSecret: *dbUserSecretName + name: &mysqlDbName nengdb nameOverride: nengdb service: name: nengdb @@ -65,15 +65,16 @@ mariadb-galera: mountSubPath: network-name-gen/data mariadb-init: - config: *mariadbConfig + config: + userCredentialsExternalSecret: *dbUserSecretName + mysqlDatabase: *mysqlDbName nameOverride: nengdb-init ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 -image: onap/ccsdk-apps-ms-neng:0.7.1 +image: onap/ccsdk-apps-ms-neng:1.3.0 pullPolicy: IfNotPresent # application configuration @@ -84,14 +85,20 @@ config: # userCredentialsExternalSecret: some-secret springProfile: live polClientAuth: cHl0aG9uOnRlc3Q= - polBasicAuth: dGVzdHBkcDphbHBoYTEyMw== - polUrl: https://pdp:8081/pdp/api/getConfig + polBasicAuthUser: healthcheck + polBasicAuthPassword: zb!XztG34 + polUrl: + https: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision + http: http://policy-xacml-pdp:8080/policy/pdpx/v1/decision polEnv: TEST polReqId: xx + disableHostVerification: true aaiCertPass: changeit aaiCertPath: /opt/etc/config/aai_keystore aaiAuth: QUFJOkFBSQ== - aaiUri: https://aai:8443/aai/v14/ + aaiUri: + https: https://aai:8443/aai/v14/ + http: http://aai:8080/aai/v14/ # default number of instances replicaCount: 1 @@ -115,7 +122,7 @@ readiness: service: type: ClusterIP name: neng-serv - portName: neng-serv-port + portName: http internalPort: 8080 externalPort: 8080