[OOM] Fixing k8s resources and limits

[oom.git] / kubernetes / cps / components / ncmp-dmi-plugin / values.yaml

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 234f9eb..4f0dfed 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -47,12 +47,12 @@ global:
     virtualhost:
       baseurl: "simpledemo.onap.org"
 
-image: onap/ncmp-dmi-plugin:1.0.0
+image: onap/ncmp-dmi-plugin:1.3.0
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
 prometheus:
-  enabled: true
+  enabled: false
 
 service:
   type: ClusterIP
@@ -66,7 +66,6 @@ service:
 
 metrics:
   serviceMonitor:
-    enabled: true
     port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
@@ -89,15 +88,15 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: 999
+      memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 4
-      memory: 4Gi
+      cpu: 999
+      memory: 2Gi
     requests:
       cpu: 2
       memory: 2Gi
@@ -121,7 +120,7 @@ readiness:
 ingress:
   enabled: true
   service:
-    - baseaddr: "ncmp-dmi-plugin"
+    - baseaddr: "cps-ncmp-dmi-plugin-api"
       path: "/"
       name: *svc_name
       port: *svc_port
@@ -147,7 +146,7 @@ config:
   spring:
     profile: helm
 
-  dmiServiceName: http://*svc_name:*svc_port
+  dmiServiceUrl: http://*svc_name:*svc_port
   sdnc:
     url: http://sdnc:8181
     username: admin
@@ -165,7 +164,7 @@ config:
 #    spring.config.min-size: 10
 
 logging:
-  level: INFO
+  level: DEBUG
   cps: DEBUG
   path: /tmp
 
@@ -178,3 +177,37 @@ updateStrategy:
   type: RollingUpdate
   maxUnavailable: 0
   maxSurge: 1
+
+# Strimzi KafkaUser and Topic config
+kafkaTopic:
+  - name: &ncmpDmiCmAvcSubscriptionNcmpDmiPluginTopic ncmp-dmi-cm-avc-subscription-ncmp-dmi-plugin
+    retentionMs: 7200000
+    segmentBytes: 1073741824
+  - name: &dmiNcmpCmAvcSubscriptionTopic dmi-ncmp-cm-avc-subscription
+    retentionMs: 7200000
+    segmentBytes: 1073741824
+  - name: &ncmpAsyncM2MTopic ncmp-async-m2m
+    retentionMs: 7200000
+    segmentBytes: 1073741824
+
+kafkaUser:
+  authenticationType: scram-sha-512
+  acls:
+    - name: ncmp-dmi-plugin-group
+      type: group
+      operations: [Read]
+    - name: *ncmpDmiCmAvcSubscriptionNcmpDmiPluginTopic
+      type: topic
+      operations: [Read]
+    - name: *dmiNcmpCmAvcSubscriptionTopic
+      type: topic
+      operations: [Write]
+    - name: *ncmpAsyncM2MTopic
+      type: topic
+      operations: [Write]
+
+topics:
+  config:
+    app.ncmp.async.topic: *ncmpAsyncM2MTopic
+    app.dmi.avc.subscription-topic: *ncmpDmiCmAvcSubscriptionNcmpDmiPluginTopic
+    app.dmi.avc.subscription-response-topic: *dmiNcmpCmAvcSubscriptionTopic