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/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/values.yaml')
-rw-r--r-- | kubernetes/vfc/values.yaml | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml index 0560832a5f..64bd029bd1 100644 --- a/kubernetes/vfc/values.yaml +++ b/kubernetes/vfc/values.yaml @@ -26,42 +26,47 @@ global: # we use this flag to determine who is responbile for serice registeration # and it can reduce duplicate registration. reg_to_msb_when_start: False - mariadb_admin: root + mariadb_admin: &mariadbAdmin root persistence: mountPath: /dockerdata-nfs + mariadbGalera: &mariadbGalera + #This flag allows VFC to instantiate its own mariadb-galera cluster + localCluster: false + service: mariadb-galera + internalPort: 3306 + nameOverride: mariadb-galera ################################################################# # Secrets metaconfig ################################################################# secrets: - - uid: "db-root-pass" + - uid: db-root-pass name: &dbRootPassSecret '{{ include "common.release" . }}-vfc-db-root-pass' + externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .) (hasSuffix "db-root-pass" (index .Values "mariadb-galera" "rootUser" "externalSecret"))}}' + login: '{{ index .Values "mariadb-galera" "rootUser" "user" }}' + password: '{{ index .Values "mariadb-galera" "rootUser" "password" }}' type: password - password: '{{ .Values.config.mariadbRootPassword }}' # application configuration config: logstashServiceName: log-ls logstashPort: 5044 -mariadb-galera: +mariadb-galera: &localMariadb rootUser: + user: *mariadbAdmin + # password: externalSecret: *dbRootPassSecret - nameOverride: &vfc-mariadb vfc-mariadb + nameOverride: &dbServer vfc-mariadb nfsprovisionerPrefix: vfc persistence: mountSubPath: vfc/data enabled: true disableNfsProvisioner: true serviceAccount: - nameOverride: *vfc-mariadb + nameOverride: *dbServer replicaCount: 1 -db: &dbConfig - mariadbService: vfc-mariadb - mariadbPort: 3306 - mariadbRootPasswordExternalSecret: *dbRootPassSecret - vfc-generic-vnfm-driver: enabled: true @@ -70,26 +75,22 @@ vfc-huawei-vnfm-driver: vfc-nslcm: enabled: true - config: - << : *dbConfig + mariadb-galera: *localMariadb vfc-redis: enabled: true vfc-vnflcm: enabled: true - config: - << : *dbConfig + mariadb-galera: *localMariadb vfc-vnfmgr: enabled: true - config: - << : *dbConfig + mariadb-galera: *localMariadb vfc-vnfres: enabled: true - config: - << : *dbConfig + mariadb-galera: *localMariadb # sub-chart configuration vfc-workflow: |