Merge "[AAI] Fix Istio compatibility and add Job ServiceAccount"

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

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index b162de7..fbd3438 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -43,11 +43,11 @@ global: # global defaults
     #Override it to aai-cassandra if localCluster is enabled.
     #in case of using k8ssandra-operator in the common cassandra installation
     #the service name is:
-    #serviceName: cassandra-dc1-service
+    serviceName: cassandra-dc1-service
     #in case of local k8ssandra-operator instance it is
     #serviceName: aai-cassandra-dc1-service
     #in case the older cassandra installation is used:
-    serviceName: cassandra
+    #serviceName: cassandra
 
     #This should be same as shared cassandra instance or if localCluster is enabled
     #then it should be same as aai-cassandra replicaCount
@@ -375,7 +375,7 @@ service:
 
 metricsService:
   type: ClusterIP
-  portName: http-prometheus
+  portName: http-pro
   externalPort: 8448
   internalPort: 8448
 
@@ -406,21 +406,49 @@ ingress:
       config:
        ssl: "redirect"
 
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipalsMetrics: []
+    authorizedPrincipals:
+      - serviceAccount: aai-graphadmin-read
+      - serviceAccount: aai-modelloader-read
+      - serviceAccount: aai-resources-read
+      - serviceAccount: aai-schema-service-read
+      - serviceAccount: aai-traversal-read
+      - serviceAccount: cds-blueprints-processor-read
+      - serviceAccount: consul-read
+      - serviceAccount: dcae-prh-read
+      - serviceAccount: dcae-slice-analysis-ms-read
+      - serviceAccount: dcae-tcagen2
+      - serviceAccount: nbi-read
+      - serviceAccount: sdnc-read
+      - serviceAccount: so-read
+      - serviceAccount: so-bpmn-infra-read
+      - serviceAccount: so-cnf-adapter-read
+      - serviceAccount: so-nssmf-adapter-read
+      - serviceAccount: so-etsi-nfvo-ns-lcm-read
+      - serviceAccount: so-etsi-sol003-adapter-read
+      - serviceAccount: so-openstack-adapter-read
+      - serviceAccount: so-sdc-controller-read
+      - serviceAccount: so-ve-vnfm-adapter
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
+
 resources:
   small:
     limits:
-      cpu: 2
+      cpu: 999
       memory: 4Gi
     requests:
       cpu: 1
-      memory: 1Gi
+      memory: 1.2Gi
   large:
     limits:
-      cpu: 4
+      cpu: 999
       memory: 8Gi
     requests:
       cpu: 2
-      memory: 2Gi
+      memory: 2.4Gi
   unlimited: {}
 
 #Pods Service Account