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 87de5a3..fbd3438 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -41,7 +41,13 @@ global: # global defaults
 
     #Service Name of the cassandra cluster to connect to.
     #Override it to aai-cassandra if localCluster is enabled.
-    serviceName: cassandra
+    #in case of using k8ssandra-operator in the common cassandra installation
+    #the service name is:
+    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
 
     #This should be same as shared cassandra instance or if localCluster is enabled
     #then it should be same as aai-cassandra replicaCount
@@ -350,6 +356,10 @@ cassandra:
   persistence:
     mountSubPath: aai/cassandra
     enabled: true
+  k8ssandraOperator:
+    enabled: false
+    config:
+      clusterName: aai-cassandra
 
 readiness:
   initialDelaySeconds: 10
@@ -365,7 +375,7 @@ service:
 
 metricsService:
   type: ClusterIP
-  portName: http-prometheus
+  portName: http-pro
   externalPort: 8448
   internalPort: 8448
 
@@ -427,18 +437,18 @@ serviceMesh:
 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