diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2024-01-22 08:40:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-01-22 08:40:50 +0000 |
| commit | 2ee6ad456a91061d64b859ba20108c7e3c556de3 (patch) | |
| tree | d86da015e169a9a15b1e31f3ee4ef4c0a2dc6400 | |
| parent | 850a3a1a49731877938250cd816ef12697262ede (diff) | |
| parent | 22318b1a44b4f099a1745bfee3a3583a612faab3 (diff) | |
Merge "[SO] Support root secret for external DB"
| -rwxr-xr-x | kubernetes/so/Chart.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/so/values.yaml | 35 |
2 files changed, 26 insertions, 11 deletions
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml index f59b5e921a..69a85399f9 100755 --- a/kubernetes/so/Chart.yaml +++ b/kubernetes/so/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 description: ONAP Service Orchestrator name: so -version: 13.0.0 +version: 13.0.1 dependencies: - name: common diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index 229decdf38..ec77d92089 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -27,9 +27,11 @@ global: servicePort: '3306' service: mariadb-galera internalPort: '3306' - #This flag allows SO to instantiate its own mariadb-galera cluster, - #serviceName and nameOverride should be so-mariadb-galera if this flag is enabled + # This flag allows SO to instantiate its own mariadb-galera cluster, + # serviceName and nameOverride should be so-mariadb-galera if this flag is enabled localCluster: false + # (optional) if localCluster=false and an external secret is used set this variable + #userRootSecret: <secretName> persistence: mountPath: /dockerdata-nfs #This configuration specifies Service and port for SDNC OAM interface @@ -68,13 +70,18 @@ secrets: # override this secret using external one with the same field that is used # to pass this to subchart. externalSecret: '{{ .Values.global.mariadbGalera.localCluster | - ternary ((hasSuffix "so-db-root-pass" (index .Values "mariadb-galera" "rootUser" "externalSecret")) | - ternary - "" - (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .)) - (include "common.mariadb.secret.rootPassSecretName" - (dict "dot" . - "chartName" .Values.global.mariadbGalera.nameOverride)) }}' + ternary (( hasSuffix "so-db-root-pass" (index .Values "mariadb-galera" "rootUser" "externalSecret")) | + ternary + "" + (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .) + ) + ( (not (empty (default "" .Values.global.mariadbGalera.userRootSecret))) | + ternary + .Values.global.mariadbGalera.userRootSecret + (include "common.mariadb.secret.rootPassSecretName" + (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride) + ) + ) }}' password: '{{ .Values.global.mariadbGalera.mariadbRootpassword }}' - uid: db-backup-creds name: &dbBackupCredsSecretName '{{ include "common.release" . }}-so-db-backup-creds' @@ -690,7 +697,15 @@ so-mariadb: db: rootPasswordExternalSecretLocalDb: *dbRootPassSecretName #rootPasswordExternalSecretLocalDb: *dbRootPassSecretName - rootPasswordExternalSecret: '{{ ternary (tpl .Values.db.rootPasswordExternalSecretLocalDb .) (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) .Values.global.mariadbGalera.localCluster }}' + rootPasswordExternalSecret: '{{ .Values.global.mariadbGalera.localCluster | + ternary (tpl .Values.db.rootPasswordExternalSecretLocalDb .) + ( (not (empty (default "" .Values.global.mariadbGalera.userRootSecret))) | + ternary + .Values.global.mariadbGalera.userRootSecret + (include "common.mariadb.secret.rootPassSecretName" + (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride) + ) + ) }}' backupCredsExternalSecret: *dbBackupCredsSecretName userCredsExternalSecret: *dbUserCredsSecretName adminCredsExternalSecret: *dbAdminCredsSecretName |