From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 27 Oct 2021 13:58:45 +0000 (+0000)
Subject: Merge "[POLICY] Altered helm chart for policy-clamp-be"
X-Git-Tag: 9.0.0~60
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ad7cb4231c63130064eb174e419a300478041721;hp=6238df47ecfcc1d2e40c2a5bec69272999d2af12;p=oom.git

Merge "[POLICY] Altered helm chart for policy-clamp-be"
---

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index d41c44ddbc..eb7aa54130 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -73,7 +73,7 @@ service:
   ports:
     - name: &port http
       port: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
@@ -83,7 +83,7 @@ prometheus:
 metrics:
   serviceMonitor:
     enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
     # targetPort: 8080
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index da055d0242..f8311697f5 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -54,14 +54,14 @@ service:
     - name: http
       port: *svc_port
       targetPort: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
 metrics:
   serviceMonitor:
     enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
       # targetPort: 8080
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 3f40a79b84..234f9eb646 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -60,14 +60,14 @@ service:
   ports:
     - name: &port http
       port: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
 metrics:
   serviceMonitor:
     enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
     # targetPort: 8080
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index d01f8557f3..bd76b97b98 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -89,7 +89,10 @@
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
             "janusgraph_connection_timeout": "10000",
-            "replication_factor": "{{.Values.global.cassandra.replicaCount}}"
+            "replication_factor": "{{.Values.global.cassandra.replicaCount}}",
+            "db_cache": "{{.Values.global.cassandra.dbCache}}",
+            "read_consistency_level": "{{.Values.global.cassandra.readConsistencyLevel}}",
+            "write_consistency_level":"{{.Values.global.cassandra.writeConsistencyLevel}}"
         },
       "DMAAP": {
          "consumer": {
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index cd3dc1e5fd..18483e7f1e 100644
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -34,6 +34,9 @@ global:
    #Shared cassandra cluster replicaCount, should be changed if localCluster is enabled
    #to match with its own cluster replica
    replicaCount: 3
+   dbCache: true
+   readConsistencyLevel: ONE
+   writeConsistencyLevel: ALL
    clusterName: cassandra
    dataCenter: Pod
   security: