X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fmessage-router%2Fvalues.yaml;h=c4bab2350ab3c1d4e7046eee2d40e9f458172ae2;hb=refs%2Fchanges%2F63%2F135863%2F4;hp=7561bc24a3243eeecb19eb9610b52762e9091888;hpb=a3a05b55e7eb3f6611dac87c49754de760f8508f;p=oom.git

diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 7561bc24a3..73618698fa 100644
--- 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,63 +19,76 @@
 # Global configuration defaults.
 #################################################################
 global:
-  nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  persistence: {}
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-mr:1.1.16
+image: onap/dmaap/dmaap-mr:1.4.4
 pullPolicy: Always
 
-kafka:
-  name: message-router-kafka
-  port: 9092
-zookeeper:
-  name: message-router-zookeeper
-  port: 2181
+#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
 
-# flag to enable debugging - application support required
-debugEnabled: false
+nodeSelector: {}
 
-# application configuration
-config: {}
+affinity: {}
 
-# default number of instances
-replicaCount: 1
+containerPort: &svc_port 3904
 
-nodeSelector: {}
+service:
+  type: ClusterIP
+  name: message-router
+  ports:
+    - name: api
+      port: *svc_port
+      port_protocol: http
 
-affinity: {}
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dmaap-mr-api"
+      name: "message-router"
+      port: *svc_port
+  config:
+    ssl: "redirect"
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 70
-  periodSeconds: 10
+  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: 70
+  initialDelaySeconds: 10
   periodSeconds: 10
+  timeoutSeconds: 1
+  successThreshold: 1
+  failureThreshold: 3
+  port: *svc_port
 
-service:
-  type: NodePort
-  name: message-router
-  portName: message-router
-  externalPort: 3904
-  nodePort: 27
-  externalPort2: 3905
-  nodePort2: 26
-
-ingress:
-  enabled: false
+# 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
@@ -81,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