From 628f47e82ec4bc6ff88a6483b2b9099739ac312d Mon Sep 17 00:00:00 2001 From: Ryan Emerson Date: Wed, 25 Sep 2024 10:16:25 +0100 Subject: [PATCH 1/2] Add Infinispan 14.0.32.Final --- config/manager/manager.yaml | 4 ++++ documentation/asciidoc/topics/ref_supported_versions.adoc | 1 + scripts/ci/kind.sh | 2 +- test/e2e/utils/common.go | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index ab7600760..e1518f3db 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -91,6 +91,10 @@ spec: { "upstream-version": "14.0.27", "image": "quay.io/infinispan/server:14.0.27.Final" + }, + { + "upstream-version": "14.0.32", + "image": "quay.io/infinispan/server:14.0.32.Final" }, { "upstream-version": "15.0.0", diff --git a/documentation/asciidoc/topics/ref_supported_versions.adoc b/documentation/asciidoc/topics/ref_supported_versions.adoc index c120be180..33cb39e4a 100644 --- a/documentation/asciidoc/topics/ref_supported_versions.adoc +++ b/documentation/asciidoc/topics/ref_supported_versions.adoc @@ -95,6 +95,7 @@ You can upgrade the version of your cluster between supported {brandname} versio 14.0.21 14.0.24 14.0.27 +14.0.32 15.0.0 15.0.3 15.0.4 diff --git a/scripts/ci/kind.sh b/scripts/ci/kind.sh index 663c6719c..c76f69938 100755 --- a/scripts/ci/kind.sh +++ b/scripts/ci/kind.sh @@ -2,7 +2,7 @@ # Modified version of the script found at https://kind.sigs.k8s.io/docs/user/local-registry/#create-a-cluster-and-registry set -o errexit -SERVER_TAGS=${SERVER_TAGS:-'14.0.1.Final 14.0.6.Final 14.0.9.Final 14.0.13.Final 14.0.17.Final 14.0.19.Final 14.0.20.Final 14.0.21.Final 14.0.24.Final 14.0.27.Final 14.0 15.0.0.Final 15.0.3.Final 15.0.4.Final 15.0.5.Final 15.0.8.Final 15.0'} +SERVER_TAGS=${SERVER_TAGS:-'14.0.1.Final 14.0.6.Final 14.0.9.Final 14.0.13.Final 14.0.17.Final 14.0.19.Final 14.0.20.Final 14.0.21.Final 14.0.24.Final 14.0.27.Final 14.0.32.Final 14.0 15.0.0.Final 15.0.3.Final 15.0.4.Final 15.0.5.Final 15.0.8.Final 15.0'} DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-"quay.io/infinispan-test/registry:2"} KINDEST_IMAGE=${KINDEST_IMAGE:-"quay.io/infinispan-test/kindest-node"} KINDEST_NODE_VERSION=${KINDEST_NODE_VERSION:-'v1.25.16'} diff --git a/test/e2e/utils/common.go b/test/e2e/utils/common.go index 36c9c5de5..c93eb6968 100644 --- a/test/e2e/utils/common.go +++ b/test/e2e/utils/common.go @@ -80,6 +80,10 @@ var VersionManager = func() *version.Manager { "downstream-version": "0.2.9-1", "upstream-version": "14.0.27", "image": "quay.io/infinispan/server:14.0.27.Final" + },{ + "downstream-version": "0.2.10-1", + "upstream-version": "14.0.32", + "image": "quay.io/infinispan/server:14.0.32.Final" },{ "downstream-version": "0.3.0-1", "upstream-version": "15.0.0", From c4dd8b39e2a622b5785f208a4cdaf53f1219d251 Mon Sep 17 00:00:00 2001 From: Ryan Emerson Date: Wed, 25 Sep 2024 10:17:20 +0100 Subject: [PATCH 2/2] Remove Jenkins references from README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index a4e1d5adc..df44f32bd 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ make bundle-build bundle-push VERSION= IMG= BUND To create an Operator release perform the following: 1. Update Operand references: - - `SERVER_TAGS` in `Jenkinsfile` and `scripts/ci/kind.sh` to include the image tage all supported Operands + - `SERVER_TAGS` in `scripts/ci/kind.sh` to include the image tage all supported Operands - `INFINISPAN_OPERAND_VERSIONS` json in `config/manager/manager.yaml` includes the latest Infinispan Server releases. Do not use the floating tags for an Operand image, e.g. `13.0`. - `server_image_version` in `documentation/asciidoc/topics/attributes/community-attributes.adoc` to point to the latest Operand version - `test/e2e/utils/common.go` VersionManager JSON to include the latest Operand @@ -145,8 +145,6 @@ Cross-Site tests require you to create two k8s Kind clusters or utilize already $ source scripts/ci/configure-xsite.sh $KIND_VERSION $METALLB_VERSION ``` -Actual `$KIND_VERSION` and `$METALLB_VERSION` values can be explored inside the `Jenkinsfile` file - To test locally in running Kind clusters, run: ``` $ go test -v ./test/e2e/xsite/ -timeout 30m