X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcps%2Fcomponents%2Fcps-temporal%2Fvalues.yaml;h=e6e0b191606b7c324f6ac29f245561c2c80b158c;hb=4753743f0743a6b22f69e718c3cdb4ba8843cea6;hp=da055d0242dad63d6fffa61be5015cb841654137;hpb=0c111ed631e5b15ce8ae3767057ed023eb3bba7f;p=oom.git

diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index da055d0242..e6e0b19160 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 #  Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2022-2023 Nordix Foundation
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,12 +41,12 @@ secrets:
     password: '{{ .Values.config.appUserPassword }}'
     passwordPolicy: generate
 
-image: onap/cps-temporal:1.0.0
+image: onap/cps-temporal:1.2.1
 containerPort: &svc_port 8080
 managementPort: &mgt_port 8081
 
 prometheus:
-  enabled: true
+  enabled: false
 
 service:
   type: ClusterIP
@@ -54,14 +55,13 @@ 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
@@ -83,18 +83,18 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 4Gi
+      cpu: "4"
+      memory: "4Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
@@ -115,7 +115,7 @@ readiness:
 ingress:
   enabled: true
   service:
-    - baseaddr: "cps-temporal"
+    - baseaddr: "cps-temporal-api"
       path: "/"
       name: "cps-temporal"
       port: *svc_port
@@ -139,14 +139,9 @@ config:
   spring:
     profile: helm
   #appUserPassword:
-
-  # Event consumption (kafka) properties
-  # All Kafka properties must be in "key: value" format instead of yaml.
-  eventConsumption:
-    spring.kafka.bootstrap-servers: message-router-kafka:9092
-    spring.kafka.security.protocol: PLAINTEXT
-    spring.kafka.consumer.group-id: cps-temporal-group
-    app.listener.data-updated.topic: cps.data-updated-events
+  app:
+    listener:
+      dataUpdatedTopic: &dataUpdatedTopic cps.data-updated-events
 
 # Any new property can be added in the env by setting in overrides in the format mentioned below
 # All the added properties must be in "key: value" format instead of yaml.
@@ -154,6 +149,17 @@ config:
 #    spring.config.max-size: 200
 #    spring.config.min-size: 10
 
+# Strimzi Kafka config
+kafkaUser:
+  authenticationType: scram-sha-512
+  acls:
+    - name: cps-temporal-group
+      type: group
+      operations: [Read]
+    - name: *dataUpdatedTopic
+      type: topic
+      operations: [Read]
+
 logging:
   level: INFO
   path: /tmp