Merge branch 'master' into rebuild-nlc-images

hazelcast · Aug 29, 2023 · 42bfd24 · 42bfd24
2 parents c8197af + 8a92e70
commit 42bfd24
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/ee-nlc-tag-push.yml b/.github/workflows/ee-nlc-tag-push.yml
@@ -6,6 +6,11 @@ on:
       - "!*"
     tags:
       - "v5.*"
+  workflow_dispatch:
+    inputs:
+      HZ_VERSION:
+        description: 'Version of Hazelcast to build the image for, e.g. 5.3.2, 5.1.1, 5.0.1'
+        required: true
 
 env:
   test_container_name_ee: hazelcast-ee-test
@@ -19,16 +24,23 @@ jobs:
       NLC_REPO_TOKEN: ${{ secrets.NLC_REPO_TOKEN }}
       NLC_IMAGE_NAME: ${{ secrets.NLC_IMAGE_NAME }}
       S3_NLC_URL: ${{ secrets.S3_NLC_URL }}
+      HZ_VERSION: ${{ github.event.inputs.HZ_VERSION }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
 
-      - name: Set Release Version
-        run: echo "RELEASE_VERSION=${GITHUB_REF:11}" >> $GITHUB_ENV
+      - name: Set HZ version
+        run: |
+          if [ -z "${{ env.HZ_VERSION }}" ]; then
+             HZ_VERSION=${GITHUB_REF:11}
+          else
+             HZ_VERSION=${{ env.HZ_VERSION }}
+          fi
+          echo "HZ_VERSION=${HZ_VERSION}" >> $GITHUB_ENV
 
       - name: Set NLC zip URL
         run: |
-          S3_NLC_ZIP_URL=${S3_NLC_URL}/hazelcast-enterprise-${RELEASE_VERSION}-nlc.zip
+          S3_NLC_ZIP_URL=${S3_NLC_URL}/hazelcast-enterprise-${HZ_VERSION}-nlc.zip
 
           echo "S3_NLC_ZIP_URL=${S3_NLC_ZIP_URL}" >> $GITHUB_ENV
 
@@ -58,7 +70,7 @@ jobs:
       - name: Build EE image
         run: |
           docker buildx build --load \
-            --build-arg HZ_VERSION=${RELEASE_VERSION} \
+            --build-arg HZ_VERSION=${HZ_VERSION} \
             --build-arg HAZELCAST_ZIP_URL=${HAZELCAST_ZIP_URL} \
             --tag hazelcast-nlc:test hazelcast-enterprise
 
@@ -86,7 +98,7 @@ jobs:
       - name: Build/Push EE image
         run: |
           docker buildx build --push \
-            --build-arg HZ_VERSION=${RELEASE_VERSION} \
+            --build-arg HZ_VERSION=${HZ_VERSION} \
             --build-arg HAZELCAST_ZIP_URL=${HAZELCAST_ZIP_URL} \
-            --tag ${NLC_IMAGE_NAME}:${RELEASE_VERSION}  \
+            --tag ${NLC_IMAGE_NAME}:${HZ_VERSION}  \
             --platform=linux/arm64,linux/amd64 hazelcast-enterprise
diff --git a/README.md b/README.md
@@ -295,15 +295,7 @@ Please see [Management Center Repository](https://github.com/hazelcast/managemen
 
 Hazelcast is prepared to work in the Kubernetes environment. For details, please check:
 
+* [Hazelcast Platform Operator](https://github.com/hazelcast/hazelcast-platform-operator)
 * Hazelcast Helm Charts:
-  * [Hazelcast IMDG](https://github.com/helm/charts/tree/master/stable/hazelcast)
-  * [Hazelcast IMDG + Management Center](https://github.com/hazelcast/charts/tree/master/stable/hazelcast)
-  * [Hazelcast IMDG Enterprise + Management Center](https://github.com/hazelcast/charts/tree/master/stable/hazelcast-enterprise)
-* [Hazelcast Kubernetes Code Sample](https://github.com/hazelcast/hazelcast-code-samples/tree/master/hazelcast-integration/kubernetes)
-* [Hazelcast SPI Kubernetes Plugin](https://github.com/hazelcast/hazelcast-kubernetes)
-
-### Hazelcast Openshift
-
-Hazelcast is prepared to work in the OpenShift environment. For details, please check:
-* [Hazelcast OpenShift Quick Start](https://github.com/hazelcast/hazelcast-openshift)
-* [Hazelcast OpenShift Code Sample](https://github.com/hazelcast/hazelcast-code-samples/tree/master/hazelcast-integration/openshift)
+  * [Hazelcast](https://github.com/helm/charts/tree/master/stable/hazelcast)
+  * [Hazelcast Enterprise](https://github.com/hazelcast/charts/tree/master/stable/hazelcast-enterprise)