diff options
Diffstat (limited to 'kubernetes')
28 files changed, 35 insertions, 27 deletions
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl index 5e0aed587c..c90b86c3a4 100644 --- a/kubernetes/common/common/templates/_mariadb.tpl +++ b/kubernetes/common/common/templates/_mariadb.tpl @@ -74,9 +74,17 @@ */}} {{- define "common.mariadbService" -}} {{- if .Values.global.mariadbGalera.localCluster -}} + {{- if .Values.global.mariadbGalera.useOperator }} + {{- printf "%s-primary" (index .Values "mariadb-galera" "nameOverride") -}} + {{- else }} {{- index .Values "mariadb-galera" "nameOverride" -}} + {{- end }} {{- else -}} + {{- if .Values.global.mariadbGalera.useOperator }} + {{- printf "%s-primary" (.Values.global.mariadbGalera.service) -}} + {{- else }} {{- .Values.global.mariadbGalera.service -}} + {{- end }} {{- end -}} {{- end -}} diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index adfa468d6e..2ab9b93330 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -30,7 +30,7 @@ global: #as the dependency check will not work otherwise (Chart.yaml) localCluster: false globalCluster: true - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml index 5d8c5e2691..8bd5e9bdc8 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml @@ -19,7 +19,7 @@ global: mariadbGalera: &mariadbGalera #This flag allows DMAAP-DR to instantiate its own mariadb-galera cluster localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml index 0aef0f5ce5..884c6da599 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml @@ -27,7 +27,7 @@ global: #as the dependency check will not work otherwise (Chart.yaml) localCluster: false globalCluster: true - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml index b504733aaa..ac97d79bba 100644 --- a/kubernetes/nbi/values.yaml +++ b/kubernetes/nbi/values.yaml @@ -24,7 +24,7 @@ global: #as the dependency check will not work otherwise (Chart.yaml) localCluster: false globalCluster: true - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera msbEnabled: false diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml index 51c6431ecd..33b56dcfc3 100644 --- a/kubernetes/sdnc/components/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml @@ -21,7 +21,7 @@ global: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml index ca6590dfd5..52f23b07b6 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml @@ -21,7 +21,7 @@ global: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml index 02bc047bc5..d86b58c47c 100644 --- a/kubernetes/sdnc/components/ueb-listener/values.yaml +++ b/kubernetes/sdnc/components/ueb-listener/values.yaml @@ -21,7 +21,7 @@ global: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 1f21570113..2b01a0ba1f 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -27,7 +27,7 @@ global: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists localCluster: false - service: &mariadbService mariadb-galera-primary + service: &mariadbService mariadb-galera internalPort: 3306 nameOverride: &mariadbName mariadb-galera diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml index c4e79dfc53..e31645630d 100644 --- a/kubernetes/so/components/so-admin-cockpit/values.yaml +++ b/kubernetes/so/components/so-admin-cockpit/values.yaml @@ -31,7 +31,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' ################################################################# diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 80d5b67185..fa3c59295e 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -23,7 +23,7 @@ global: sdncOamService: sdnc-oam sdncOamPort: 8282 mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' readinessCheck: diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index 619ef03775..c5bd850483 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -22,7 +22,7 @@ global: app: msoKey: 07a7159d3bf51a0e53be7a8f89699be7 mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' readinessCheck: diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml index c3388d66e4..2310ccebfa 100644 --- a/kubernetes/so/components/so-cnfm-lcm/values.yaml +++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml @@ -19,7 +19,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' ################################################################# diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml index 2084befa14..e86aa2129b 100644 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml @@ -20,7 +20,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' ################################################################# diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml index f565eb0a70..853f019795 100755 --- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml +++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml @@ -20,7 +20,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' readinessCheck: diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml index 85336813e5..4aa322934b 100755 --- a/kubernetes/so/components/so-mariadb/values.yaml +++ b/kubernetes/so/components/so-mariadb/values.yaml @@ -26,7 +26,7 @@ global: ubuntuInitRepository: docker.io mariadbGalera: nameOverride: &mariadbName mariadb-galera - service: mariadb-galera-primary + service: mariadb-galera servicePort: "3306" migration: enabled: false diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml index 8e83734a9f..6562d8496a 100755 --- a/kubernetes/so/components/so-nssmf-adapter/values.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml @@ -20,7 +20,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' readinessCheck: diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml index 3ce43c679c..74679d8a2e 100755 --- a/kubernetes/so/components/so-oof-adapter/values.yaml +++ b/kubernetes/so/components/so-oof-adapter/values.yaml @@ -21,7 +21,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' # Secrets metaconfig diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index 3b68a362cb..a33c68ae00 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -20,7 +20,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' readinessCheck: diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index 5f02a85eb3..8774725f3e 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -20,7 +20,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' readinessCheck: diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index 77b94dde50..5805621668 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -20,7 +20,7 @@ global: persistence: mountPath: /dockerdata-nfs mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' soSdcListenerKafkaUser: so-sdc-list-user diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml index 9542ab8e99..345f8746d8 100755 --- a/kubernetes/so/components/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml @@ -23,7 +23,7 @@ global: sdncOamService: sdnc-oam sdncOamPort: 8282 mariadbGalera: - service: mariadb-galera-primary + service: mariadb-galera servicePort: '3306' ################################################################# diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index 81cd1d9662..c252938943 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -23,7 +23,7 @@ global: mariadbGalera: nameOverride: mariadb-galera servicePort: '3306' - service: mariadb-galera-primary + service: mariadb-galera internalPort: '3306' # mariadbRootPassword: secretpassword # rootPasswordExternalSecret: some secret diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml index 1b0fd7c735..0cd3ce178a 100644 --- a/kubernetes/vfc/components/vfc-nslcm/values.yaml +++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml @@ -21,7 +21,7 @@ global: ssl_enabled: false mariadbGalera: localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml index 191a6ee9b4..fcad261817 100644 --- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml +++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml @@ -21,7 +21,7 @@ global: ssl_enabled: false mariadbGalera: localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml index e6f5654184..528bbe0c01 100644 --- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml +++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml @@ -21,7 +21,7 @@ global: ssl_enabled: false mariadbGalera: localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml index 4850c96f11..c2954d5517 100644 --- a/kubernetes/vfc/components/vfc-vnfres/values.yaml +++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml @@ -21,7 +21,7 @@ global: ssl_enabled: false mariadbGalera: localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml index 6fa669104b..3a15165e2f 100644 --- a/kubernetes/vfc/values.yaml +++ b/kubernetes/vfc/values.yaml @@ -32,7 +32,7 @@ global: mariadbGalera: &mariadbGalera #This flag allows VFC to instantiate its own mariadb-galera cluster localCluster: false - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera centralizedLoggingEnabled: true |