[MARIADB][COMMON] Add support for mariadb-operator

[oom.git] / kubernetes / so / values.yaml

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 014cbad..bf412e8 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -22,9 +22,8 @@ global:
   centralizedLoggingEnabled: true
   mariadbGalera:
     nameOverride: mariadb-galera
-    serviceName: mariadb-galera
     servicePort: '3306'
-    service: mariadb-galera
+    service: mariadb-galera-primary
     internalPort: '3306'
     # mariadbRootPassword: secretpassword
     # rootPasswordExternalSecret: some secret
@@ -51,8 +50,6 @@ global:
     auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
     defaultCloudOwner: onap
 
-  soSdcListenerKafkaUser: so-sdc-list-user
-
 readinessCheck:
   wait_for:
     jobs:
@@ -141,7 +138,7 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
-image: onap/so/api-handler-infra:1.11.0
+image: onap/so/api-handler-infra:1.12.2
 
 server:
   aai:
@@ -552,17 +549,17 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2000m
+      cpu: 999
       memory: 4Gi
     requests:
-      cpu: 500m
+      cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 4000m
+      cpu: 999
       memory: 8Gi
     requests:
-      cpu: 1000m
+      cpu: 1
       memory: 2Gi
   unlimited: {}
 
@@ -586,6 +583,9 @@ mariadb-galera:
     externalSecret: *dbRootPassSecretName
   nameOverride: &so-mariadb so-mariadb-galera
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
   persistence:
     mountSubPath: so/mariadb-galera/data
     enabled: true
@@ -599,6 +599,18 @@ ingress:
       name: 'so'
       port: 8080
 
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: consul-read
+      - serviceAccount: consul-server-read
+      - serviceAccount: nbi-read
+      - serviceAccount: policy-drools-pdp-read
+      - serviceAccount: so-bpmn-infra-read
+      - serviceAccount: robot-read
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
+
 mso:
   adapters:
     requestDb:
@@ -696,8 +708,6 @@ so-sdc-controller:
   db:
     <<: *dbSecrets
   logConfigMapNamePrefix: '{{ include "common.release" . }}-so'
-  config:
-    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.soSdcListenerKafkaUser }}'
 
 so-sdnc-adapter:
   enabled: true