[OOM] Fixing k8s cpu limits

[oom.git] / kubernetes / dmaap / components / message-router / values.yaml

diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index c4bab23..7361869 100644 (file)
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -1,5 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021-2022 Nordix Foundation
+# Modifications Copyright © 2023 DTAG
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,85 +19,76 @@
 # Global configuration defaults.
 #################################################################
 global:
-  nodePortPrefix: 302
+  persistence: {}
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/dmaap-mr:1.1.18
+image: onap/dmaap/dmaap-mr:1.4.4
 pullPolicy: Always
 
-kafka:
-  name: message-router-kafka
-  port: 9092
-zookeeper:
-  name: message-router-zookeeper
-  port: 2181
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# application configuration
-config: {}
-
-# default number of instances
-replicaCount: 1
+#Strimzi zookeeper_tunnel config
+zkTunnelService:
+    type: ClusterIP
+    name: zk-tunnel-svc
+    portName: tcp-zk-tunnel
+    protocol: TCP
+    internalPort: 2181
+    logLevel: debug
+    image: scholzj/zoo-entrance:latest
 
 nodeSelector: {}
 
 affinity: {}
 
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 70
-  periodSeconds: 10
-  timeoutSeconds: 1
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  port: api
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 70
-  periodSeconds: 10
-  timeoutSeconds: 1
-  port: api
+containerPort: &svc_port 3904
 
 service:
-  type: NodePort
+  type: ClusterIP
   name: message-router
-  both_tls_and_plain: true
-  msb:
-    - port: 3904
-      url: "/"
-      version: "v1"
-      protocol: "REST"
-      visualRange: "1"
   ports:
     - name: api
-      port: 3905
-      plain_port: 3904
+      port: *svc_port
       port_protocol: http
-      nodePort: 26
-
-prometheus:
-  jmx:
-    enabled: false
-    image: solsson/kafka-prometheus-jmx-exporter@sha256
-    imageTag: 6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143
-    port: 5556
-    targetPort: 5555
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "mr.api"
+    - baseaddr: "dmaap-mr-api"
       name: "message-router"
-      port: 3905
+      port: *svc_port
   config:
     ssl: "redirect"
 
+# probe configuration parameters
+liveness:
+  initialDelaySeconds: 10
+  periodSeconds: 30
+  timeoutSeconds: 15
+  successThreshold: 1
+  failureThreshold: 3
+  # necessary to disable liveness probe when setting breakpoints
+  # in debugger so K8s doesn't restart unresponsive container
+  port: *svc_port
+  enabled: true
+
+readiness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  timeoutSeconds: 1
+  successThreshold: 1
+  failureThreshold: 3
+  port: *svc_port
+
+# periodSeconds is set longer to avoid DMaaP 429 error
+startup:
+  initialDelaySeconds: 90
+  periodSeconds: 30
+  timeoutSeconds: 15
+  successThreshold: 1
+  failureThreshold: 70
+  port: *svc_port
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -103,16 +96,22 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2000m
+      cpu: 2
       memory: 4Gi
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: 1
+      memory: 2Gi
   large:
     limits:
-      cpu: 4000m
+      cpu: 4
       memory: 8Gi
     requests:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: 2
+      memory: 4Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: message-router
+  roles:
+    - read