aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aai/components/aai-babel/values.yaml2
-rw-r--r--kubernetes/aai/components/aai-graphadmin/values.yaml6
-rw-r--r--kubernetes/aai/components/aai-resources/values.yaml6
-rw-r--r--kubernetes/aai/components/aai-schema-service/values.yaml6
-rw-r--r--kubernetes/aai/components/aai-traversal/values.yaml6
-rw-r--r--kubernetes/aai/values.yaml4
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/values.yaml2
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/values.yaml2
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/values.yaml2
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/values.yaml2
-rw-r--r--kubernetes/cds/components/cds-ui/templates/deployment.yaml2
-rw-r--r--kubernetes/cds/components/cds-ui/values.yaml4
-rw-r--r--kubernetes/common/common/templates/_mariadb.tpl8
-rw-r--r--kubernetes/common/network-name-gen/values.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/values.yaml2
-rw-r--r--kubernetes/modeling/components/modeling-etsicatalog/values.yaml2
-rw-r--r--kubernetes/nbi/values.yaml2
-rw-r--r--kubernetes/sdnc/components/dmaap-listener/values.yaml2
-rw-r--r--kubernetes/sdnc/components/sdnc-ansible-server/values.yaml2
-rw-r--r--kubernetes/sdnc/components/ueb-listener/values.yaml2
-rw-r--r--kubernetes/sdnc/values.yaml2
-rw-r--r--kubernetes/so/components/so-admin-cockpit/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-bpmn-infra/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-catalog-db-adapter/values.yaml2
-rw-r--r--kubernetes/so/components/so-cnfm-lcm/values.yaml2
-rw-r--r--kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-etsi-sol005-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-mariadb/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-nssmf-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-oof-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-request-db-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-sdc-controller/values.yaml2
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/values.yaml2
-rw-r--r--kubernetes/strimzi/templates/strimzi-kafka.yaml24
-rw-r--r--kubernetes/strimzi/values.yaml3
-rw-r--r--kubernetes/vfc/components/vfc-nslcm/values.yaml2
-rw-r--r--kubernetes/vfc/components/vfc-vnflcm/values.yaml2
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/values.yaml2
-rw-r--r--kubernetes/vfc/components/vfc-vnfres/values.yaml2
-rw-r--r--kubernetes/vfc/values.yaml2
42 files changed, 86 insertions, 47 deletions
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index 31edf9b2da..c9f930abae 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -25,7 +25,7 @@ global: {}
#################################################################
# application image
-image: onap/babel:1.11.0
+image: onap/babel:1.12.3
flavor: small
flavorOverride: small
diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index d58c6b0175..749d6a5d12 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -79,11 +79,11 @@ global: # global defaults
version:
# Current version of the REST API
api:
- default: v27
+ default: v28
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
# Specifies from which version related link should appear
related:
link: v11
@@ -102,7 +102,7 @@ global: # global defaults
clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
# application image
-image: onap/aai-graphadmin:1.11.2
+image: onap/aai-graphadmin:1.12.3
pullPolicy: Always
restartPolicy: Always
flavor: small
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 2ec0862974..0df30ed0cf 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -75,11 +75,11 @@ global: # global defaults
version:
# Current version of the REST API
api:
- default: v27
+ default: v28
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
# Specifies from which version related link should appear
related:
link: v11
@@ -123,7 +123,7 @@ aai_enpoints:
url: external-system
# application image
-image: onap/aai-resources:1.11.0
+image: onap/aai-resources:1.12.3
pullPolicy: Always
restartPolicy: Always
flavor: small
diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index 88f17861c7..4266978b9f 100644
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -41,11 +41,11 @@ global: # global defaults
version:
# Current version of the REST API
api:
- default: v27
+ default: v28
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
# Specifies from which version related link should appear
related:
link: v11
@@ -60,7 +60,7 @@ global: # global defaults
label: v12
# application image
-image: onap/aai-schema-service:1.11.0
+image: onap/aai-schema-service:1.12.3
pullPolicy: Always
restartPolicy: Always
flavorOverride: small
diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index fb4453f766..3c6714ad92 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -84,11 +84,11 @@ global: # global defaults
version:
# Current version of the REST API
api:
- default: v27
+ default: v28
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
# Specifies from which version related link should appear
related:
link: v11
@@ -107,7 +107,7 @@ global: # global defaults
clients: SDNC,MSO,SO,robot-ete
# application image
-image: onap/aai-traversal:1.11.2
+image: onap/aai-traversal:1.12.3
pullPolicy: Always
restartPolicy: Always
flavor: small
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 04b5ac2530..6e90089298 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -238,11 +238,11 @@ global: # global defaults
version:
# Current version of the REST API
api:
- default: v27
+ default: v28
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
# Specifies from which version related link should appear
related:
link: v11
diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index 1be791c47a..a082c2c8ca 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -66,7 +66,7 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-image: onap/ccsdk-blueprintsprocessor:1.5.1
+image: onap/ccsdk-blueprintsprocessor:1.5.3
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index a6015ebbcf..70d2f09d43 100755
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -32,7 +32,7 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: onap/ccsdk-commandexecutor:1.5.1
+image: onap/ccsdk-commandexecutor:1.5.3
pullPolicy: Always
# application configuration
diff --git a/kubernetes/cds/components/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index fb415d1cf0..148a98dddb 100755
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -30,7 +30,7 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: onap/ccsdk-py-executor:1.5.1
+image: onap/ccsdk-py-executor:1.5.3
pullPolicy: Always
# default number of instances
diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index 3897a332cf..3918825e5f 100644
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -30,7 +30,7 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: onap/ccsdk-sdclistener:1.5.1
+image: onap/ccsdk-sdclistener:1.5.3
name: sdc-listener
pullPolicy: Always
diff --git a/kubernetes/cds/components/cds-ui/templates/deployment.yaml b/kubernetes/cds/components/cds-ui/templates/deployment.yaml
index 6887e6710e..225ee4c5e7 100644
--- a/kubernetes/cds/components/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-ui/templates/deployment.yaml
@@ -41,6 +41,8 @@ spec:
env:
- name: HOST
value: 0.0.0.0
+ - name: PROTOCOL
+ value: "{{ .Values.config.env.protocol }}"
- name: APP_ACTION_DEPLOY_BLUEPRINT_GRPC_ENABLED
value: "{{ .Values.config.app.action.deployBlueprint.grpcEnabled }}"
- name: API_BLUEPRINT_CONTROLLER_HTTP_BASE_URL
diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index b45a89de1a..cadf716b71 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -23,11 +23,13 @@ subChartsOnly:
enabled: true
# application image
-image: onap/ccsdk-cds-ui-server:1.5.1
+image: onap/ccsdk-cds-ui-server:1.5.3
pullPolicy: Always
# application configuration
config:
+ env:
+ protocol: HTTP
app:
action:
deployBlueprint:
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/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index 4071aa03a6..a808b84441 100644
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -72,6 +72,18 @@ spec:
securityContext:
runAsUser: 0
fsGroup: 0
+ {{- if .Values.affinity.podAntiAffinity.enabled }}
+ affinity:
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - labelSelector:
+ matchExpressions:
+ - key: strimzi.io/name
+ operator: In
+ values:
+ - {{ include "common.fullname" . }}-kafka
+ topologyKey: "kubernetes.io/hostname"
+ {{- end }}
config:
default.replication.factor: {{ .Values.replicaCount }}
min.insync.replicas: {{ (eq 1.0 (.Values.replicaCount)) | ternary 1 (sub .Values.replicaCount 1) }}
@@ -104,6 +116,18 @@ spec:
securityContext:
runAsUser: 0
fsGroup: 0
+ {{- if .Values.affinity.podAntiAffinity.enabled }}
+ affinity:
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - labelSelector:
+ matchExpressions:
+ - key: strimzi.io/name
+ operator: In
+ values:
+ - {{ include "common.fullname" . }}-zookeeper
+ topologyKey: "kubernetes.io/hostname"
+ {{- end }}
replicas: {{ .Values.replicaCount }}
config:
ssl.hostnameVerification: false
diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index bb22de7ebd..a9eed5d8b9 100644
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -29,6 +29,9 @@ global:
# Application configuration defaults.
#################################################################
replicaCount: 3
+affinity:
+ podAntiAffinity:
+ enabled: true
config:
kafkaVersion: 3.4.0
authType: simple
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