K8s - Hazelcast - Upgrade Management Center to 5.3 (GoogleCloudPlatfo…

…rm#2465) * Docker - Prometheus Operator - Bump version to 0.67 and fix vulnerabilities removing go-vendor * K8s - Hazelcast - Upgrade Management Center to 5.3 * K8s - Hazelcast - Fix Helm Chart for 5.3 version
DiegoAll · Oct 2, 2023 · eec1d68 · eec1d68
1 parent b9fd3a2
commit eec1d68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/k8s/hazelcast/Makefile b/k8s/hazelcast/Makefile
@@ -7,7 +7,7 @@ CHART_NAME := hazelcast
 APP_ID ?= $(CHART_NAME)
 
 TRACK ?= 5.3
-TRACK_MC ?= 5.2
+TRACK_MC ?= 5.3
 METRICS_EXPORTER_TAG ?= v0.5.1
 
 SOURCE_REGISTRY ?= marketplace.gcr.io/google

diff --git a/k8s/hazelcast/apptest/tester/tests/mancenter-suite.yaml b/k8s/hazelcast/apptest/tester/tests/mancenter-suite.yaml
@@ -2,7 +2,7 @@ actions:
 
 - name: Login page should open properly
   httpTest:
-    url: http://{{ .Env.APP_INSTANCE_NAME }}-mancenter-svc:8080/hazelcast-mancenter/
+    url: http://{{ .Env.APP_INSTANCE_NAME }}-mancenter-svc:8080/
     expect:
       statusCode:
         equals: 200

diff --git a/k8s/hazelcast/chart/hazelcast/templates/hazelcast-statefulset.yaml b/k8s/hazelcast/chart/hazelcast/templates/hazelcast-statefulset.yaml
@@ -43,20 +43,20 @@ spec:
           httpGet:
             path: /hazelcast/health/node-state
             port: 5701
-          initialDelaySeconds: 30
+          initialDelaySeconds: 60
           periodSeconds: 10
           timeoutSeconds: 30
           successThreshold: 1
           failureThreshold: 10
         readinessProbe:
           httpGet:
-            path: /hazelcast/health/ready
+            path: /hazelcast/health/node-state
             port: 5701
-          initialDelaySeconds: 30
+          initialDelaySeconds: 60
           periodSeconds: 10
           timeoutSeconds: 30
           successThreshold: 1
-          failureThreshold: 10
+          failureThreshold: 20
         volumeMounts:
         - name: {{ .Release.Name }}-pvc
           mountPath: /custom_folder
@@ -72,7 +72,7 @@ spec:
         - name: PROMETHEUS_PORT
           value: "8080"
         - name: JAVA_OPTS
-          value: "-Dhazelcast.config=/data/hazelcast/hazelcast.xml -DserviceName={{ .Release.Name }}-svc -Dnamespace={{ .Release.Namespace }} -Dhazelcast.mancenter.enabled=true -Dhazelcast.mancenter.url=http://{{ .Release.Name }}-mancenter-svc.{{ .Release.Namespace }}.svc:8080/hazelcast-mancenter -Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait=600 -Dhazelcast.jmx=true {{ .Values.hazelcast.javaOpts }}"
+          value: "-Dhazelcast.config=/data/hazelcast/hazelcast.xml -DserviceName={{ .Release.Name }}-svc -Dnamespace={{ .Release.Namespace }} -Dhazelcast.mancenter.enabled=true -Dhazelcast.mancenter.url=http://{{ .Release.Name }}-mancenter-svc.{{ .Release.Namespace }}.svc:8080/ -Dhazelcast.shutdownhook.policy=GRACEFUL -Dhazelcast.shutdownhook.enabled=true -Dhazelcast.graceful.shutdown.max.wait=600 -Dhazelcast.jmx=true {{ .Values.hazelcast.javaOpts }}"
         securityContext:
           runAsNonRoot: true
           runAsUser: 65534

diff --git a/k8s/hazelcast/chart/hazelcast/templates/mancenter-statefulset.yaml b/k8s/hazelcast/chart/hazelcast/templates/mancenter-statefulset.yaml
@@ -35,7 +35,7 @@ spec:
             cpu: {{ .Values.mancenter.resources.cpu }}
         livenessProbe:
           httpGet:
-            path: /hazelcast-mancenter/health
+            path: /health
             port: 8081
           initialDelaySeconds: 90
           periodSeconds: 10