Merge "[AAI] Add variables for HEAP and METASPACE sizes"
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index 31edf9b..c9f930a 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -25,7 +25,7 @@
 #################################################################
 
 # 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/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 2bee19f..865dfe3 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -64,11 +64,7 @@
       - command:
         - /bin/bash
         - -c
-        {{- if .Values.global.cassandra.useOperator }}
-        - /app/ready.py --app-name aai-cassandra-reaper --timeout 1 || /app/ready.py --app-name cassandra-reaper
-        {{- else }}
         - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
-        {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index c80d348..1a81249 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -60,9 +60,9 @@
         args:
         - --app-name
         {{- if .Values.global.cassandra.localCluster }}
-        - {{ ternary "aai-cassandra-reaper" "aai-cassandra" .Values.global.cassandra.useOperator }}
+        - aai-cassandra
         {{- else }}
-        - {{ ternary "cassandra-reaper" "cassandra" .Values.global.cassandra.useOperator }}
+        - cassandra
         {{- end }}
         - --container-name
         - aai-schema-service
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index b2bc0e7..bf3279f 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -65,9 +65,9 @@
         args:
         - --app-name
         {{- if .Values.global.cassandra.localCluster }}
-        - {{ ternary "aai-cassandra-reaper" "aai-cassandra" .Values.global.cassandra.useOperator }}
+        - aai-cassandra
         {{- else }}
-        - {{ ternary "cassandra-reaper" "cassandra" .Values.global.cassandra.useOperator }}
+        - cassandra
         {{- end }}
         - --container-name
         - aai-schema-service
diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 09396cc..749d6a5 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -79,11 +79,11 @@
       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 @@
       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
@@ -233,13 +233,13 @@
 
 # To make logback capping values configurable
 logback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 6GB
   queueSize: 1000
 
 accessLogback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 6GB
 
diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index 40b89ea..805f3cd 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties
@@ -1,7 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 # Modifications Copyright © 2020 Orange
-# Modifications Copyright © 2023 Nordix Foundation
+# Modifications Copyright © 2023 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,6 +28,14 @@
 spring.main.allow-bean-definition-overriding=true
 server.servlet.context-path=/
 
+spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
+spring.sleuth.messaging.jms.enabled = false
+spring.sleuth.trace-id128=true
+spring.sleuth.sampler.probability={{ .Values.tracing.sampling.probability }}
+spring.sleuth.propagation.type=w3c, b3
+spring.sleuth.supports-join=false
+spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
+
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.keycloak.adapters.springboot.KeycloakAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
 
 spring.profiles.active={{ .Values.global.config.profiles.active }}
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 7615f4b..3a4d568 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -75,11 +75,11 @@
       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 @@
     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
@@ -251,6 +251,14 @@
       memory: 6Gi
   unlimited: {}
 
+tracing:
+  collector:
+    baseUrl: http://jaeger-collector.istio-system:9411
+  sampling:
+    probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
+  ignorePatterns:
+    - /aai/util.*
+
 metrics:
   serviceMonitor:
     enabled: false
@@ -316,12 +324,12 @@
 
 # To make logback capping values configurable
 logback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 1GB
   queueSize: 1000
 
 accessLogback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 1GB
diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index 88f1786..4266978 100644
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -41,11 +41,11 @@
       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 @@
           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 6230576..2b7e78f 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -84,11 +84,11 @@
       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 @@
       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
@@ -242,13 +242,13 @@
 
 # To make logback capping values configurable
 logback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 6GB
   queueSize: 1000
 
 accessLogback:
-  logToFileEnabled: true
+  logToFileEnabled: false
   maxHistory: 7
   totalSizeCap: 6GB
 
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 04b5ac2..6e90089 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -238,11 +238,11 @@
       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 1be791c..a082c2c 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -66,7 +66,7 @@
 # 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 a6015eb..70d2f09 100755
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -32,7 +32,7 @@
 # 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 fb415d1..148a98d 100755
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -30,7 +30,7 @@
 # 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 3897a33..3918825 100644
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -30,7 +30,7 @@
 # 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 6887e67..225ee4c 100644
--- a/kubernetes/cds/components/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-ui/templates/deployment.yaml
@@ -41,6 +41,8 @@
           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 b45a89d..cadf716 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -23,11 +23,13 @@
   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/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index eef716e..205c711 100644
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -29,7 +29,7 @@
     enableServiceAccount: false
 
 k8ssandraOperator:
-  cassandraVersion: 4.0.1
+  cassandraVersion: 4.0.10
   persistence:
     #storageClassName: default
     size: 10Gi
@@ -47,7 +47,10 @@
   datacenters:
     - name: dc1
       size: 3
+  reaper:
+    enabled: true
   stargate:
+    enabled: true
     tag: v1.0.76
     size: 1
     jvmOptions:
diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl
index 3ea3ff1..b9f6766 100644
--- a/kubernetes/common/common/templates/_cassOp.tpl
+++ b/kubernetes/common/common/templates/_cassOp.tpl
@@ -23,6 +23,7 @@
 metadata:
   name: {{ .Values.k8ssandraOperator.config.clusterName }}
 spec:
+  {{ if .Values.k8ssandraOperator.reaper.enabled -}}
   reaper:
     initContainerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
@@ -34,6 +35,8 @@
       commonLabels:
         app: {{ .Values.k8ssandraOperator.config.clusterName }}-reaper
         version: {{ .Values.k8ssandraOperator.cassandraVersion }}
+  {{- end }}
+  {{ if .Values.k8ssandraOperator.stargate.enabled -}}
   stargate:
     containerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
@@ -56,6 +59,7 @@
       failureThreshold: 20
       successThreshold: 1
       timeoutSeconds: 20
+  {{- end }}
   cassandra:
     serverVersion: {{ .Values.k8ssandraOperator.cassandraVersion }}
     storageConfig:
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 5e0aed5..c90b86c 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 adfa468..2ab9b93 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -30,7 +30,7 @@
     #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/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
index 2079e6b..19ca5fd 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
@@ -52,7 +52,7 @@
   initialDelaySeconds: 10
   periodSeconds: 10
 # application image
-image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.4.0
+image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.4.1
 
 # Resource Limit flavor -By Default using small
 flavor: small
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 5d8c5e2..8bd5e9b 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -19,7 +19,7 @@
   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/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 3b16bf3..f60a2d3 100755
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -296,8 +296,8 @@
         done
       fi
     done
-
-
+    # Disable delay
+    DELAY="false"
     for subchart in * ; do
       SUBCHART_OVERRIDES=$CACHE_SUBCHART_DIR/$subchart/subchart-overrides.yaml
 
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 0aef0f5..884c6da 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -27,7 +27,7 @@
     #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 b504733..ac97d79 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -24,7 +24,7 @@
     #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/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index b93e798..d61ff6f 100755
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -48,7 +48,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.9.2
+image: onap/policy-apex-pdp:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 721cd35..0f54144 100755
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -48,7 +48,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.8.2
+image: onap/policy-api:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index aeeb4d1..b6815df 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -42,7 +42,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-a1pms-ppnt:6.4.3
+image: onap/policy-clamp-ac-a1pms-ppnt:7.0.3
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-a1pms-ppnt
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index 646032e..58f7954 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -42,7 +42,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-http-ppnt:6.4.3
+image: onap/policy-clamp-ac-http-ppnt:7.0.3
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-http-ppnt
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index 18f61fc..ef3c384 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -43,7 +43,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-k8s-ppnt:6.4.3
+image: onap/policy-clamp-ac-k8s-ppnt:7.0.3
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-k8s-ppnt
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
index 5ae9d6b..633bb68 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -42,7 +42,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-kserve-ppnt:6.4.3
+image: onap/policy-clamp-ac-kserve-ppnt:7.0.3
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-kserve-ppnt
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index 2de601e..1f23112 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -54,7 +54,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-pf-ppnt:6.4.3
+image: onap/policy-clamp-ac-pf-ppnt:7.0.3
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-pf-ppnt
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index 3b01e46..b1aadcd 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -49,7 +49,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-runtime-acm:6.4.3
+image: onap/policy-clamp-runtime-acm:7.0.3
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-runtime-acm
diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 48a05f1..ca9b887 100755
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -58,7 +58,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.9.2
+image: onap/policy-distribution:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 3b4ad5c..fe94cd7 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -41,7 +41,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.12.2
+image: onap/policy-pdpd-cl:2.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index b6bf2a9..aeccf3a 100644
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -29,7 +29,7 @@
 flavor: small
 
 # application image
-image: onap/policy-gui:2.4.2
+image: onap/policy-gui:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index df2d679..ecd78b5 100755
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -69,7 +69,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.8.2
+image: onap/policy-pap:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 1f773dd..d4c20cc 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -49,7 +49,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.8.2
+image: onap/policy-xacml-pdp:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index b3b4743..47ced8a 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -153,7 +153,7 @@
 #################################################################
 
 dbmigrator:
-  image: onap/policy-db-migrator:2.6.2
+  image: onap/policy-db-migrator:3.0.2
   schema: policyadmin
   policy_home: "/opt/app/policy"
 
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index b12258c..074a166 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -39,8 +39,8 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-backend-all-plugins:1.12.5
-backendInitImage: onap/sdc-backend-init:1.12.5
+image: onap/sdc-backend-all-plugins:1.13.6
+backendInitImage: onap/sdc-backend-init:1.13.6
 
 pullPolicy: Always
 
diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index 8082054..3738ff4 100644
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -36,9 +36,9 @@
         args:
         - --app-name
         {{- if .Values.global.sdc_cassandra.localCluster }}
-        - {{ ternary "sdc-cs-reaper" "sdc-cs" .Values.global.sdc_cassandra.useOperator }}
+        - sdc-cs
         {{- else }}
-        - {{ ternary "cassandra-reaper" "cassandra" .Values.global.sdc_cassandra.useOperator }}
+        - cassandra
         {{- end }}
         - "-t"
         - "15"
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index ac8103e..364c363 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -72,8 +72,8 @@
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.12.5
-cassandraInitImage: onap/sdc-cassandra-init:1.12.5
+image: onap/sdc-cassandra:1.13.6
+cassandraInitImage: onap/sdc-cassandra-init:1.13.6
 pullPolicy: Always
 
 config:
diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 91d4325..7c99757 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -23,7 +23,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-frontend:1.12.5
+image: onap/sdc-frontend:1.13.6
 pullPolicy: Always
 
 config:
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index aabb17f..81d6373 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -35,8 +35,8 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-onboard-backend:1.12.5
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.12.5
+image: onap/sdc-onboard-backend:1.13.6
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.13.6
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 51c6431..33b56dc 100644
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -21,7 +21,7 @@
     #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 ca6590d..52f23b0 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -21,7 +21,7 @@
     #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 02bc047..d86b58c 100644
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -21,7 +21,7 @@
     #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 1f21570..2b01a0b 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -27,7 +27,7 @@
     #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 2b05dbe..e316456 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -31,7 +31,7 @@
   persistence:
     mountPath: /dockerdata-nfs
   mariadbGalera:
-    service: mariadb-galera-primary
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
@@ -111,17 +111,17 @@
   small:
     requests:
       memory: 1Gi
-      cpu: 0.25
+      cpu: 0.5
     limits:
       memory: 4Gi
-      cpu: 0.5
+      cpu: 1
   large:
     requests:
       memory: 2Gi
-      cpu: 0.5
+      cpu: 1
     limits:
       memory: 8Gi
-      cpu: 1
+      cpu: 2
   unlimited: {}
 readinessProbe:
   port: 9091
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 80d5b67..fa3c592 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -23,7 +23,7 @@
   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 619ef03..c5bd850 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 @@
   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 c3388d6..2310cce 100644
--- a/kubernetes/so/components/so-cnfm-lcm/values.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml
@@ -19,7 +19,7 @@
   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 2084bef..e86aa21 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 @@
   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 f565eb0..853f019 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 @@
   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 8533681..4aa3229 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -26,7 +26,7 @@
   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 8e83734..6562d84 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -20,7 +20,7 @@
   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 3ce43c6..74679d8 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -21,7 +21,7 @@
   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 3b68a36..a33c68a 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -20,7 +20,7 @@
   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 5f02a85..8774725 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 @@
   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 77b94dd..5805621 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -20,7 +20,7 @@
   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 9542ab8..345f874 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -23,7 +23,7 @@
   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 81cd1d9..c252938 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -23,7 +23,7 @@
   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 4071aa0..a808b84 100644
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -72,6 +72,18 @@
         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 @@
         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 bb22de7..a9eed5d 100644
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -29,6 +29,9 @@
 # Application configuration defaults.
 #################################################################
 replicaCount: 3
+affinity:
+  podAntiAffinity:
+    enabled: true
 config:
   kafkaVersion: 3.4.0
   authType: simple
diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 8cdda46..87756d6 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -145,17 +145,17 @@
   small:
     limits:
       cpu: 1.5
-      memory: 350Mi
+      memory: 2Gi
     requests:
       cpu: 1
-      memory: 245Mi
+      memory: 1Gi
   large:
     limits:
       cpu: 2
-      memory: 500Mi
+      memory: 4Gi
     requests:
       cpu: 1
-      memory: 500Mi
+      memory: 2Gi
   unlimited: {}
 
 serviceAccount:
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 1b0fd7c..0cd3ce1 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -21,7 +21,7 @@
     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 191a6ee..fcad261 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -21,7 +21,7 @@
     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 e6f5654..528bbe0 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -21,7 +21,7 @@
     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 4850c96..c2954d5 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -21,7 +21,7 @@
     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 6fa6691..3a15165 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -32,7 +32,7 @@
   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