diff options
author | Mahmoud Abdelhamid <mahmoud.abdelhamid@orange.com> | 2021-09-24 17:28:28 +0200 |
---|---|---|
committer | Mahmoud Abdelhamid <mahmoud.abdelhamid@orange.com> | 2021-10-04 19:46:20 +0200 |
commit | a74326fc152d115af5ffa1eae61d592a9e3ca74f (patch) | |
tree | 17b1ef0f441952b5dfccb14d2bef9450d8f6d10d /kubernetes/vfc/components/vfc-vnfres/values.yaml | |
parent | a001a61bdd6430027b39281f9d79366e837c7494 (diff) |
[VFC] Use common mariadb-galera instance
Have following updates for VFC:
- Add section under .Values.global for shared mariadb instance default
info with a condition to instantiate local instance.
- Update the related section of Mariadb-galera under .Values
- Add condition under requirments.yaml to install local mariadb instance
* Note: Since Components initiate their own DBs and Users, there is no
need to initiate the common mariadb-galera with mariadb-init, instead
root password will injected to components to be able to create the DBs.
Have following updates for nslcm, vnflcm, vnfmgr and vnfres:
- Update .Values to accommodate for the new changes in parent .Values
file.
- Update root secret with the condition of having local mariadb or using
the common.
- Update deployments to include the definitions of mariadb service and
port defined in (common/_mariadb.tpl)
Issue-ID: OOM-2840
Signed-off-by: Mahmoud Abdelhamid <mahmoud.abdelhamid@orange.com>
Change-Id: Ia6a8e91ca3978928c4bf336a3a86ab1c6d64597a
Diffstat (limited to 'kubernetes/vfc/components/vfc-vnfres/values.yaml')
-rw-r--r-- | kubernetes/vfc/components/vfc-vnfres/values.yaml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml index 7683912aa2..204d414e7d 100644 --- a/kubernetes/vfc/components/vfc-vnfres/values.yaml +++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml @@ -19,15 +19,20 @@ global: nodePortPrefix: 302 config: ssl_enabled: false + mariadbGalera: + localCluster: false + service: mariadb-galera + internalPort: 3306 + nameOverride: mariadb-galera ################################################################# # Secrets metaconfig ################################################################# secrets: - - uid: "db-root-pass" - externalSecret: '{{ tpl (default "" .Values.config.mariadbRootPasswordExternalSecret) . }}' + - uid: db-root-pass + externalSecret: '{{ ternary (index .Values "mariadb-galera" "rootUser" "externalSecret") (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" (default "mariadb-galera" .Values.global.mariadbGalera.nameOverride))) .Values.global.mariadbGalera.localCluster }}' type: password - password: '{{ .Values.config.mariadbRootPassword }}' + password: '{{ index .Values "mariadb-galera" "rootUser" "password" }}' policy: required ################################################################# @@ -45,13 +50,11 @@ istioSidecar: true # flag to enable debugging - application support required debugEnabled: false -# application configuration -config: - mariadbService: vfc-mariadb - mariadbPort: 3306 - mariadbRootPassword: secretpassword - # mariadbRootPasswordExternalSecret: some secret - +# Local mariadb galera instance default name +mariadb-galera: + rootUser: + externalSecret: '{{ include "common.release" . }}-vfc-db-root-pass' + nameOverride: vfc-mariadb # default number of instances replicaCount: 1 |