[COMMON] Update all ReadinessChecks

[oom.git] / kubernetes / cps / components / cps-core / values.yaml

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index b44f456..d728639 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -68,30 +68,30 @@ global:
     container:
       name: postgres
 
-image: onap/cps-and-ncmp:3.2.6
-containerPort: &svc_port 8080
-managementPort: &mgt_port 8081
+image: onap/cps-and-ncmp:3.3.11
 
 service:
   type: ClusterIP
+  headless: {}
   name: cps-core
+  internalPort: &svc_port 8080
   ports:
     - name: &port http
       port: *svc_port
-    - name: http-management
-      port: *mgt_port
-      targetPort: *mgt_port
+  headlessPorts:
+    - name: tcp-hazelcast
+      port: 5701
 
 prometheus:
   enabled: false
 
 metrics:
   serviceMonitor:
-    port: http-management
+    port: http
       ## specify target port if name is not given to the port in the service definition
       ##
     # targetPort: 8080
-    path: /manage/prometheus
+    path: /actuator/prometheus
     interval: 60s
     basicAuth:
       enabled: false
@@ -109,18 +109,18 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 999
-      memory: 1.5Gi
+      cpu: "2"
+      memory: "1.5Gi"
     requests:
-      cpu: 1
-      memory: 1.5Gi
+      cpu: "1"
+      memory: "1.5Gi"
   large:
     limits:
-      cpu: 999
-      memory: 3Gi
+      cpu: "4"
+      memory: "3Gi"
     requests:
-      cpu: 2
-      memory: 3Gi
+      cpu: "2"
+      memory: "3Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
@@ -129,20 +129,20 @@ liveness:
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
-  path: /manage/health
-  port: *mgt_port
+  path: /actuator/health
+  port: *svc_port
 
 readiness:
   initialDelaySeconds: 15
   periodSeconds: 15
-  path: /manage/health
-  port: *mgt_port
+  path: /actuator/health
+  port: *svc_port
 
 startup:
   failureThreshold: 5
   periodSeconds: 60
-  path: /manage/health
-  port: *mgt_port
+  path: /actuator/health
+  port: *svc_port
 
 ingress:
   enabled: true
@@ -197,12 +197,6 @@ kafkaTopic:
   - name: &dmiCmEventsTopic dmi-cm-events
     retentionMs: 7200000
     segmentBytes: 1073741824
-  - name: &ncmpAsyncM2MTopic ncmp-async-m2m
-    retentionMs: 7200000
-    segmentBytes: 1073741824
-  - name: &cmAvcSubscriptionTopic cm-avc-subscription
-    retentionMs: 7200000
-    segmentBytes: 1073741824
 
 kafkaUser:
   authenticationType: scram-sha-512
@@ -216,10 +210,10 @@ kafkaUser:
     - name: *dmiCmEventsTopic
       type: topic
       operations: [Read]
-    - name: *ncmpAsyncM2MTopic
+    - name: &ncmpAsyncM2MTopic ncmp-async-m2m
       type: topic
       operations: [Read]
-    - name: *cmAvcSubscriptionTopic
+    - name: &cmAvcSubscriptionTopic cm-avc-subscription
       type: topic
       operations: [Read]
 
@@ -275,10 +269,19 @@ postgres-init:
 
 readinessCheck:
   wait_for:
-    - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
+    services:
+      - '{{ .Values.global.postgres.service.name2 }}'
 
 minReadySeconds: 10
 updateStrategy:
   type: RollingUpdate
   maxUnavailable: 0
   maxSurge: 1
+
+# Hazlecast custom configurations.
+hazelcast:
+  config:
+    kubernetesDiscovery: true
+    kubernetesServiceName: cps-core-headless
+
+