diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 5a44fcab..8fa5ef87 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -48,7 +48,7 @@ jobs: strategy: matrix: go-version: [ '1.20' ] - kube-version: [ 'v1.24.16' ] + kube-version: [ 'v1.24.15' ] solr-version: [ '9' ] # [ '8', '9' ] steps: diff --git a/dev-docs/e2e-testing.md b/dev-docs/e2e-testing.md index aad92cf3..609270af 100644 --- a/dev-docs/e2e-testing.md +++ b/dev-docs/e2e-testing.md @@ -50,7 +50,7 @@ $ make e2e-tests TEST_SEED=89724023 SOLR_IMAGE=apache/solr-nightly:10.0.0-SNAPSH Default is `solr:8.11`. - **KUBERETES_VERSION** - A full Kubernetes version, starting with `v`, to use when creating the KinD Cluster. To find a list of all possible versions, check the [KinD Node Docker tags](https://hub.docker.com/r/kindest/node/tags). - Default is `v1.24.16`. + Default is `v1.24.15`. ### Filtering tests diff --git a/hack/release/smoke_test/test_cluster.sh b/hack/release/smoke_test/test_cluster.sh index 5c18aebf..4b95d5f8 100755 --- a/hack/release/smoke_test/test_cluster.sh +++ b/hack/release/smoke_test/test_cluster.sh @@ -32,7 +32,7 @@ Test the release candidate in a Kind cluster -l Base location of the staged artifacts. Can be a URL or relative or absolute file path. -i Solr Operator docker image to use (Optional, defaults to apache/solr-operator:) -g GPG Key (fingerprint) used to sign the artifacts (Optional, if not provided then the helm chart will not be verified) - -k Kubernetes Version to test with (full tag, e.g. v1.24.16) (Optional, defaults to a compatible version) + -k Kubernetes Version to test with (full tag, e.g. v1.24.15) (Optional, defaults to a compatible version) -t Full solr image, or image tag (for the official Solr image), to test with (e.g. apache/solr-nightly:9.0.0, 8.11). (Optional, defaults to a compatible version) EOF } @@ -74,7 +74,7 @@ if [[ -z "${LOCATION:-}" ]]; then echo "Specify an base artifact location -l, or through the LOCATION env var" >&2 && exit 1 fi if [[ -z "${KUBERNETES_VERSION:-}" ]]; then - KUBERNETES_VERSION="v1.24.16" + KUBERNETES_VERSION="v1.24.15" fi if [[ -z "${SOLR_IMAGE:-}" ]]; then SOLR_IMAGE="${SOLR_VERSION:-9}" diff --git a/tests/scripts/manage_e2e_tests.sh b/tests/scripts/manage_e2e_tests.sh index 98d1f6d7..d30db276 100755 --- a/tests/scripts/manage_e2e_tests.sh +++ b/tests/scripts/manage_e2e_tests.sh @@ -73,7 +73,7 @@ if [[ -z "${OPERATOR_IMAGE:-}" ]]; then echo "Specify a Docker image for the Solr Operator through -i, or through the OPERATOR_IMAGE env var" >&2 && exit 1 fi if [[ -z "${KUBERNETES_VERSION:-}" ]]; then - KUBERNETES_VERSION="v1.24.16" + KUBERNETES_VERSION="v1.24.15" fi if [[ -z "${SOLR_IMAGE:-}" ]]; then SOLR_IMAGE="${SOLR_VERSION:-8.11}"