Adapt OpenShift Code Sample to Hazelcast 4.0 (#411)

Rafał Leszko · web-flow · commit 36eb09070ad6 · 2020-03-16T11:26:45.000+01:00
* Adapt OpenShift Code Sample to Hazelcast 4.0
diff --git a/hazelcast-integration/openshift/README.md b/hazelcast-integration/openshift/README.md
@@ -56,7 +56,7 @@ Log in as Username: "developer", Password: "developer".
 
 ## Step 2: Start Hazelcast cluster
 
-Note that, in case of Hazelcast Enterprise OpenShift (both [Centos](hazelcast-cluster/hazelcast-enterprise-openshift-centos/) and [RHEL](hazelcast-cluster/hazelcast-enterprise-openshift-rhel/), you will need a valid Hazelcast license key. If you don't have one, you can either use [Hazelcast OpenShift Origin](hazelcast-cluster/hazelcast-openshift-origin/) instead or get a trial key from [this link](https://hazelcast.com/hazelcast-enterprise-download/trial/).
+Note that, in case of Hazelcast Enterprise (and Hazelcast Enterprise RHEL), you will need a valid Hazelcast license key. If you don't have one, you can either use [Hazelcast OpenShift Origin](hazelcast-cluster/hazelcast/) instead or get a trial key from [this link](https://hazelcast.com/hazelcast-enterprise-download/trial/).
 
 **1) Create Project**
 
@@ -73,11 +73,11 @@ Then, you can create a new project.
 $ oc new-project hazelcast
 ```
 
-Note that, in case of [Hazelcast Enterprise OpenShift RHEL](hazelcast-cluster/hazelcast-enterprise-openshift-rhel/), you will need to authenticate to Red Hat Container Catalog as described [here](#authenticate-to-red-hat-container-catalog).
+Note that, in case of [Hazelcast Enterprise RHEL](hazelcast-cluster/hazelcast-enterprise-rhel/), you will need to authenticate to Red Hat Container Catalog as described [here](#authenticate-to-red-hat-container-catalog).
 
 **2) Start Hazelcast cluster**
 
-Change the directory to Hazelcast Enterprise (`$ cd hazelcast-cluster/hazelcast-enterprise-openshift-centos`), Hazelcast Enterprise RHEL (`$ cd hazelcast-cluster/hazelcast-enterprise-openshift-rhel`) or Hazelcast (`$ cd hazelcast-cluster/hazelcast-openshift-origin`).
+Change the directory to Hazelcast Enterprise (`$ cd hazelcast-cluster/hazelcast-enterprise`), Hazelcast Enterprise RHEL (`$ cd hazelcast-cluster/hazelcast-enterprise-rhel`) or Hazelcast (`$ cd hazelcast-cluster/hazelcast`).
 
 Then, start the cluster with the following command.
 
@@ -89,7 +89,7 @@ $ oc new-app -f hazelcast.yaml \
 
 Used parameters:
 * `NAMESPACE`: must be the same as the OpenShift project's name
-* `ENTERPRISE_LICENSE_KEY`: Hazelcast Enterprise License (not needed for [Hazelcast OpenShift Origin](hazelcast-cluster/hazelcast-openshift-origin/))
+* `ENTERPRISE_LICENSE_KEY`: Hazelcast Enterprise License (not needed for [Hazelcast OpenShift Origin](hazelcast-cluster/hazelcast/))
 
 **3) Check that Hazelcast is running**
 
@@ -264,7 +264,7 @@ You can check that the application really works together with the Hazelcast clus
 
 If you want to play with "Entry Processor" from the code sample, you need to place the Entry Processor JAR into the `/data` directory of Hazelcast. Currently, you use ConfigMap with `hazelcast.xml` as the volume mounted to `/data`. However, if we want to copy the custom JAR, you need to change it and use OpenShift Persistent Volume.
 
-Let's first change the directory to Hazelcast Enterprise (`$ cd hazelcast-cluster/hazelcast-enterprise-openshift-centos`), Hazelcast Enterprise RHEL (`$ cd hazelcast-cluster/hazelcast-enterprise-openshift-rhel`) or Hazelcast (`$ cd hazelcast-cluster/hazelcast-openshift-origin`).
+Let's first change the directory to Hazelcast Enterprise (`$ cd hazelcast-cluster/hazelcast-enterprise`), Hazelcast Enterprise RHEL (`$ cd hazelcast-cluster/hazelcast-enterprise-rhel`) or Hazelcast (`$ cd hazelcast-cluster/hazelcast`).
 
 Then, replace ConfigMap with the Persistent Storage.
 
diff --git a/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.xml b/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.xml
diff --git a/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.yaml b/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.yaml
@@ -0,0 +1,5 @@
+hazelcast-client:
+  network:
+    kubernetes:
+      enabled: true
+      service-dns: hazelcast-service.hazelcast.svc.cluster.local
diff --git a/hazelcast-integration/openshift/hazelcast-cluster/README.md b/hazelcast-integration/openshift/hazelcast-cluster/README.md
@@ -2,9 +2,9 @@
 
 This repository contains the following folders:
 
-* [Hazelcast Enterprise OpenShift RHEL](hazelcast-enterprise-openshift-rhel/): provides the template to deploy Hazelcast IMDG Enterprise RHEL onto OpenShift Container Platform
-* [Hazelcast Enterprise OpenShift Centos](hazelcast-enterprise-openshift-centos/): provides the template to deploy Hazelcast IMDG Enterprise onto OpenShift Container Platform
-* [Hazelcast OpenShift Origin](hazelcast-openshift-origin/): provides the template to deploy Hazelcast IMDG onto OpenShift
+* [Hazelcast Enterprise RHEL](hazelcast-enterprise-rhel/): provides the template to deploy Hazelcast IMDG Enterprise RHEL onto OpenShift Container Platform
+* [Hazelcast Enterprise](hazelcast-enterprise/): provides the template to deploy Hazelcast IMDG Enterprise onto OpenShift Container Platform
+* [Hazelcast](hazelcast/): provides the template to deploy Hazelcast IMDG onto OpenShift
 
 # Quick start
 
diff --git a/hazelcast-integration/openshift/hazelcast-cluster/hazelcast-enterprise-rhel/hazelcast.yaml b/hazelcast-integration/openshift/hazelcast-cluster/hazelcast-enterprise-rhel/hazelcast.yaml
@@ -12,7 +12,7 @@ labels:
 parameters:
 - name: HAZELCAST_IMAGE
   description: "Defines the location of Hazelcast image"
-  value: registry.connect.redhat.com/hazelcast/hazelcast-3-rhel7:3.12
+  value: registry.connect.redhat.com/hazelcast/hazelcast-4-rhel8:4.0
   required: true
 - name: SERVICE_NAME
   description: "Defines the service name of the POD to lookup of Kubernetes"
@@ -30,7 +30,7 @@ parameters:
   required": true
 - name: MANAGEMENT_CENTER_IMAGE
   description: "Defines the location of Hazelcast Management Center image"
-  value: registry.connect.redhat.com/hazelcast/management-center-3-rhel7:3.12
+  value: registry.connect.redhat.com/hazelcast/management-center-4-rhel8:4.0
   required: true
 - name: MANAGEMENT_CENTER_SERVICE_NAME
   description: "Defines the service name of Management Center"
@@ -43,19 +43,19 @@ objects:
   metadata:
     name: hazelcast-configuration
   data:
-    hazelcast.xml: |-
-      <?xml version="1.0" encoding="UTF-8"?>
-      <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
-                     xmlns="http://www.hazelcast.com/schema/config"
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <network>
-          <join>
-            <multicast enabled="false"/>
-            <kubernetes enabled="true"/>
-          </join>
-        </network>
-        <management-center enabled="true">http://management-center-service.${namespace}.svc:8080/hazelcast-mancenter</management-center>
-      </hazelcast>
+    hazelcast.yaml: |-
+      hazelcast:
+        network:
+          join:
+            multicast:
+              enabled: false
+            kubernetes:
+              enabled: true
+          rest-api:
+            enabled: true
+            endpoint-groups:
+              HEALTH_CHECK:
+                enabled: true
 
 - apiVersion: apps/v1
   kind: StatefulSet
@@ -110,7 +110,7 @@ objects:
           - name: HZ_DATA
             value: /data/hazelcast
           - name: JAVA_OPTS
-            value: "-Dnamespace=${NAMESPACE}"
+            value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml -Dnamespace=${NAMESPACE}"
         volumes:
         - name: hazelcast-storage
           configMap:
@@ -170,7 +170,7 @@ objects:
             containerPort: 8080
           livenessProbe:
             httpGet:
-              path: /hazelcast-mancenter
+              path: /health
               port: 8080
             initialDelaySeconds: 30
             periodSeconds: 10
@@ -179,7 +179,7 @@ objects:
             failureThreshold: 10
           readinessProbe:
             httpGet:
-              path: /hazelcast-mancenter
+              path: /health
               port: 8080
             initialDelaySeconds: 30
             periodSeconds: 10
@@ -189,6 +189,9 @@ objects:
           volumeMounts:
           - name: mancenter-storage
             mountPath: /data
+          env:
+            - name: MC_INIT_CMD
+              value: "./mc-conf.sh cluster add -H /data -cn dev -ma ${SERVICE_NAME}.${NAMESPACE}.svc.cluster.local"
         volumes:
         - name: mancenter-storage
           persistentVolumeClaim:
diff --git a/hazelcast-integration/openshift/hazelcast-cluster/hazelcast-enterprise/hazelcast.yaml b/hazelcast-integration/openshift/hazelcast-cluster/hazelcast-enterprise/hazelcast.yaml
@@ -12,7 +12,7 @@ labels:
 parameters:
 - name: HAZELCAST_IMAGE
   description: "Defines the location of Hazelcast image"
-  value: hazelcast/hazelcast-enterprise:3.12
+  value: hazelcast/hazelcast-enterprise:4.0
   required: true
 - name: SERVICE_NAME
   description: "Defines the service name of the POD to lookup of Kubernetes"
@@ -30,7 +30,7 @@ parameters:
   required": true
 - name: MANAGEMENT_CENTER_IMAGE
   description: "Defines the location of Hazelcast Management Center image"
-  value: hazelcast/management-center:3.12
+  value: hazelcast/management-center:4.0
   required: true
 - name: MANAGEMENT_CENTER_SERVICE_NAME
   description: "Defines the service name of Management Center"
@@ -43,19 +43,19 @@ objects:
   metadata:
     name: hazelcast-configuration
   data:
-    hazelcast.xml: |-
-      <?xml version="1.0" encoding="UTF-8"?>
-      <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
-                     xmlns="http://www.hazelcast.com/schema/config"
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <network>
-          <join>
-            <multicast enabled="false"/>
-            <kubernetes enabled="true"/>
-          </join>
-        </network>
-        <management-center enabled="true">http://management-center-service.${namespace}.svc:8080/hazelcast-mancenter</management-center>
-      </hazelcast>
+    hazelcast.yaml: |-
+      hazelcast:
+        network:
+          join:
+            multicast:
+              enabled: false
+            kubernetes:
+              enabled: true
+          rest-api:
+            enabled: true
+            endpoint-groups:
+              HEALTH_CHECK:
+                enabled: true
 
 - apiVersion: apps/v1
   kind: StatefulSet
@@ -108,7 +108,7 @@ objects:
           - name: HZ_LICENSE_KEY
             value: ${ENTERPRISE_LICENSE_KEY}
           - name: JAVA_OPTS
-            value: "-Dhazelcast.rest.enabled=true -Dhazelcast.config=/data/hazelcast/hazelcast.xml -Dnamespace=${NAMESPACE}"
+            value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml -Dnamespace=${NAMESPACE}"
         volumes:
         - name: hazelcast-storage
           configMap:
@@ -168,7 +168,7 @@ objects:
             containerPort: 8080
           livenessProbe:
             httpGet:
-              path: /hazelcast-mancenter
+              path: /health
               port: 8080
             initialDelaySeconds: 30
             periodSeconds: 10
@@ -177,7 +177,7 @@ objects:
             failureThreshold: 10
           readinessProbe:
             httpGet:
-              path: /hazelcast-mancenter
+              path: /health
               port: 8080
             initialDelaySeconds: 30
             periodSeconds: 10
@@ -187,6 +187,9 @@ objects:
           volumeMounts:
           - name: mancenter-storage
             mountPath: /data
+          env:
+          - name: MC_INIT_CMD
+            value: "./mc-conf.sh cluster add -H /data -cn dev -ma ${SERVICE_NAME}.${NAMESPACE}.svc.cluster.local"
         volumes:
         - name: mancenter-storage
           persistentVolumeClaim:
diff --git a/hazelcast-integration/openshift/hazelcast-cluster/hazelcast/hazelcast.yaml b/hazelcast-integration/openshift/hazelcast-cluster/hazelcast/hazelcast.yaml
@@ -12,7 +12,7 @@ labels:
 parameters:
 - name: HAZELCAST_IMAGE
   description: "Defines the location of Hazelcast image"
-  value: hazelcast/hazelcast:3.12
+  value: hazelcast/hazelcast:4.0
   required: true
 - name: SERVICE_NAME
   description: "Defines the service name of the POD to lookup of Kubernetes"
@@ -32,18 +32,19 @@ objects:
   metadata:
     name: hazelcast-configuration
   data:
-    hazelcast.xml: |-
-      <?xml version="1.0" encoding="UTF-8"?>
-      <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-                     xmlns="http://www.hazelcast.com/schema/config"
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <network>
-          <join>
-            <multicast enabled="false"/>
-            <kubernetes enabled="true"/>
-          </join>
-        </network>
-      </hazelcast>
+    hazelcast.yaml: |-
+      hazelcast:
+        network:
+          join:
+            multicast:
+              enabled: false
+            kubernetes:
+              enabled: true
+          rest-api:
+            enabled: true
+            endpoint-groups:
+              HEALTH_CHECK:
+                enabled: true
 
 - apiVersion: apps/v1
   kind: StatefulSet
@@ -92,7 +93,7 @@ objects:
           - name: HAZELCAST_KUBERNETES_SERVICE_DNS
             value: ${SERVICE_NAME}.${NAMESPACE}.svc.cluster.local
           - name: JAVA_OPTS
-            value: "-Dhazelcast.rest.enabled=true -Dhazelcast.config=/data/hazelcast/hazelcast.xml"
+            value: "-Dhazelcast.config=/data/hazelcast/hazelcast.yaml"
         volumes:
         - name: hazelcast-storage
           configMap:
diff --git a/hazelcast-integration/openshift/hazelcast-configuration/hazelcast.xml b/hazelcast-integration/openshift/hazelcast-configuration/hazelcast.xml
