X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=6ab96adde7ab9a99b3fb90318e46b4047d8f0a80;hb=601a630a60e08321baeb5a21aa345b6b0d016b0a;hp=5a4d204c58c4e1b9ebae1b2f49f25bb91d8fa303;hpb=6bafcb64b40cc96bddc65273f4f0f7be8584a90d;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 5a4d204c58..6ab96adde7 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -30,8 +30,6 @@ global:
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
-  # Enabling CMPv2 with CertManager
-  CMPv2CertManagerIntegration: false
 
 #################################################################
 # Secrets metaconfig
@@ -86,12 +84,67 @@ secrets:
     externalSecret: '{{ .Values.config.netboxApikeyExternalSecret }}'
     password: '{{ .Values.config.netboxApikey }}'
     passwordPolicy: required
+  - uid: aai-truststore-password
+    type: password
+    externalSecret: '{{ .Values.config.aaiTruststoreExternalSecret }}'
+    password: '{{ .Values.config.aaiTruststorePassword }}'
+    passwordPolicy: required
+  - uid: ansible-truststore-password
+    type: password
+    externalSecret: '{{ .Values.config.ansibleTruststoreExternalSecret }}'
+    password: '{{ .Values.config.ansibleTruststorePassword }}'
+    passwordPolicy: required
+  - uid: truststore-password
+    type: password
+    externalSecret: '{{ .Values.config.truststoreExternalSecret }}'
+    password: '{{ .Values.config.truststorePassword }}'
+    passwordPolicy: required
+  - uid: keystore-password
+    type: password
+    externalSecret: '{{ .Values.config.keystoreExternalSecret }}'
+    password: '{{ .Values.config.keystorePassword }}'
+    passwordPolicy: required
+  - uid: dmaap-authkey
+    type: password
+    externalSecret: '{{ .Values.config.dmaapAuthKeyExternalSecret }}'
+    password: '{{ .Values.config.dmaapAuthKey }}'
+    passwordPolicy: required
   - uid: aai-user-creds
     type: basicAuth
     externalSecret: '{{ .Values.config.aaiCredsExternalSecret}}'
     login: '{{ .Values.config.aaiUser }}'
     password: '{{ .Values.config.aaiPassword }}'
     passwordPolicy: required
+  - uid: so-user-creds
+    type: basicAuth
+    externalSecret: '{{ .Values.config.soCredsExternalSecret}}'
+    login: '{{ .Values.config.soUser }}'
+    password: '{{ .Values.config.soPassword }}'
+    passwordPolicy: required
+  - uid: neng-user-creds
+    type: basicAuth
+    externalSecret: '{{ .Values.config.nengCredsExternalSecret}}'
+    login: '{{ .Values.config.nengUser }}'
+    password: '{{ .Values.config.nengPassword }}'
+    passwordPolicy: required
+  - uid: cds-user-creds
+    type: basicAuth
+    externalSecret: '{{ .Values.config.cdsCredsExternalSecret}}'
+    login: '{{ .Values.config.cdsUser }}'
+    password: '{{ .Values.config.cdsPassword }}'
+    passwordPolicy: required
+  - uid: honeycomb-user-creds
+    type: basicAuth
+    externalSecret: '{{ .Values.config.honeycombCredsExternalSecret}}'
+    login: '{{ .Values.config.honeycombUser }}'
+    password: '{{ .Values.config.honeycombPassword }}'
+    passwordPolicy: required
+  - uid: dmaap-user-creds
+    type: basicAuth
+    externalSecret: '{{ .Values.config.dmaapCredsExternalSecret}}'
+    login: '{{ .Values.config.dmaapUser }}'
+    password: '{{ .Values.config.dmaapPassword }}'
+    passwordPolicy: required
   - uid: modeling-user-creds
     type: basicAuth
     externalSecret: '{{ .Values.config.modelingCredsExternalSecret}}'
@@ -117,6 +170,17 @@ secrets:
     login: '{{ .Values.config.scaleoutUser }}'
     password: '{{ .Values.config.scaleoutPassword }}'
     passwordPolicy: required
+  - uid: oauth-token-secret
+    type: password
+    externalSecret: '{{ ternary (tpl (default "" .Values.config.sdnr.oauth.tokenExternalSecret) .) "oauth-disabled" .Values.config.sdnr.oauth.enabled }}'
+    password: '{{ .Values.config.sdnr.oauth.tokenSecret }}'
+    passwordPolicy: required
+  - uid: keycloak-secret
+    type: password
+    externalSecret: '{{ ternary (tpl (default "" .Values.config.sdnr.oauth.providersSecrets.keycloakExternalSecret) .) "oauth-disabled" .Values.config.sdnr.oauth.enabled }}'
+    password: '{{ .Values.config.sdnr.oauth.providersSecrets.keycloak }}'
+    passwordPolicy: required
+
 #################################################################
 # Certificates
 #################################################################
@@ -129,6 +193,7 @@ certificates:
       outputType:
         - jks
       passwordSecretRef:
+        create: true
         name: sdnc-cmpv2-keystore-password
         key: password
     issuer:
@@ -141,7 +206,7 @@ certificates:
 # application images
 
 pullPolicy: Always
-image: onap/sdnc-image:2.0.5
+image: onap/sdnc-image:2.1.6
 
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -155,9 +220,34 @@ config:
   # odlCredsExternalSecret: some secret
   netboxApikey: onceuponatimeiplayedwithnetbox20180814
   # netboxApikeyExternalSecret: some secret
+  aaiTruststorePassword: changeit
+  # aaiTruststoreExternalSecret: some secret
+  ansibleTruststorePassword: changeit
+  # ansibleTruststoreExternalSecret: some secret
+  truststorePassword: adminadmin
+  # truststoreExternalSecret: some secret
+  keystorePassword: adminadmin
+  # keystoreExternalSecret: some secret
   aaiUser: sdnc@sdnc.onap.org
   aaiPassword: demo123456!
   # aaiCredsExternalSecret: some secret
+  soUser: sdncaBpmn
+  soPassword: password1$
+  # soCredsExternalSecret: some secret
+  nengUser: ccsdkapps
+  nengPassword: ccsdkapps
+  # nengCredsExternalSecret: some secret
+  cdsUser: ccsdkapps
+  cdsPassword: ccsdkapps
+  # cdsCredsExternalSecret: some secret
+  honeycombUser: admin
+  honeycombPassword: admin
+  # honeycombCredsExternalSecret: some secret
+  dmaapUser: admin
+  dmaapPassword: admin
+  dmaapAuthKey: "fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs="
+  # dmaapCredsExternalSecret: some secret
+  # dmaapAuthKeyExternalSecret: some secret
   modelingUser: ccsdkapps
   modelingPassword: ccsdkapps
   # modelingCredsExternalSecret: some secret
@@ -231,6 +321,9 @@ config:
     sdnrdbTrustAllCerts: true
     mountpointRegistrarEnabled: false
     mountpointStateProviderEnabled: false
+    netconfCallHome:
+      enabled: true
+    #
     # enable and set dmaap-proxy for mountpointRegistrar
     dmaapProxy:
       enabled: false
@@ -238,10 +331,28 @@ config:
       user: addUserHere
       password: addPasswordHere
       url: addProxyUrlHere
-
-
-
-
+    oauth:
+      enabled: false
+      tokenIssuer: ONAP SDNC
+      tokenSecret: secret
+      supportOdlusers: true
+      redirectUri: null
+      publicUrl: none
+      odluxRbac:
+        enabled: true
+      # example definition for a oauth provider
+      providersSecrets:
+        keycloak: d8d7ed52-0691-4353-9ac6-5383e72e9c46
+      providers:
+      - id: keycloak
+        type: KEYCLOAK
+        host: http://keycloak:8080
+        clientId: odlux.app
+        secret: ${KEYCLOAK_SECRET}
+        scope: openid
+        title: ONAP Keycloak Provider
+        roleMapping:
+          mykeycloak: admin
 
 # dependency / sub-chart configuration
 certInitializer:
@@ -348,6 +459,8 @@ dgbuilder:
     dbServiceName: mariadb-galera
     # This should be revisited and changed to plain text
     dgUserPassword: cc03e747a6afbbcbf8be7668acfebee5
+  serviceAccount:
+    nameOverride: sdnc-dgbuilder
   mariadb-galera:
   service:
     name: sdnc-dgbuilder
@@ -386,7 +499,7 @@ elasticsearch:
     # handles master and data node functionality
     dedicatednode: "no"
     nameOverride: *elasticSearchName
-    cluster_name: *elasticSearchName
+    cluster_name: sdnrdb-cluster
 # enable
 sdnc-web:
   enabled: true
@@ -439,6 +552,9 @@ service:
   geoNodePort5: 65
   geoNodePort6: 66
 
+  callHomePort: 6666
+  callHomeNodePort: 66
+
 ## Persist data to a persitent volume
 persistence:
   enabled: true