Skip to content

Commit aae6f12

Browse files
committed
feat: Support Kubernetes 1.35
1 parent 43657e9 commit aae6f12

5 files changed

Lines changed: 16 additions & 14 deletions

File tree

stackgres-k8s/ci/build/Dockerfile-ci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,6 @@ FROM registry.access.redhat.com/ubi8-minimal:8.10-1018
162162
RUN chmod a+x /bin/kind-0.26.0
163163
RUN wget -O /bin/kind-0.29.0 "https://github.com/kubernetes-sigs/kind/releases/download/v0.29.0/kind-linux-$(uname -m | grep -qxF aarch64 && echo arm64 || echo amd64)"
164164
RUN chmod a+x /bin/kind-0.29.0
165-
RUN wget -O /bin/kind-0.30.0 "https://github.com/kubernetes-sigs/kind/releases/download/v0.30.0/kind-linux-$(uname -m | grep -qxF aarch64 && echo arm64 || echo amd64)"
166-
RUN chmod a+x /bin/kind-0.30.0
165+
RUN wget -O /bin/kind-0.31.0 "https://github.com/kubernetes-sigs/kind/releases/download/v0.31.0/kind-linux-$(uname -m | grep -qxF aarch64 && echo arm64 || echo amd64)"
166+
RUN chmod a+x /bin/kind-0.31.0
167167

stackgres-k8s/ci/test/e2e-run-all-tests-gitlab.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set -e
1717
export E2E_SHELL="${E2E_SHELL:-sh}"
1818
export E2E_ENV="${E2E_ENV:-kind}"
1919
export E2E_PARALLELISM="${E2E_PARALLELISM:-32}"
20-
export K8S_VERSION="${K8S_VERSION:-1.24}"
20+
export K8S_VERSION="${K8S_VERSION:-1.32}"
2121
export K8S_FROM_DIND=true
2222
export K8S_REUSE="${K8S_REUSE:-false}"
2323
# shellcheck disable=SC2155

stackgres-k8s/e2e/envs/kind

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ KIND_0_23_0="${KIND_0_23_0:-kind-0.23.0}"
1515
KIND_0_25_0="${KIND_0_25_0:-kind-0.25.0}"
1616
KIND_0_26_0="${KIND_0_26_0:-kind-0.26.0}"
1717
KIND_0_29_0="${KIND_0_29_0:-kind-0.29.0}"
18-
KIND_0_30_0="${KIND_0_30_0:-kind-0.30.0}"
18+
KIND_0_31_0="${KIND_0_31_0:-kind-0.31.0}"
1919

2020
check_kind_version() {
2121
if [ "$(echo "$K8S_VERSION" | tr . '\n' | head -n 2 | xargs -I @ printf '%05d' @)" \
2222
-ge "$(echo "1.31" | tr . '\n' | xargs -I @ printf '%05d' @)" ]
2323
then
24-
KIND="$KIND_0_30_0"
25-
if ! "$KIND" version | grep -q -F 'kind v0.30.0 '
24+
KIND="$KIND_0_31_0"
25+
if ! "$KIND" version | grep -q -F 'kind v0.31.0 '
2626
then
27-
echo "To run Kubernetes 1.31+ kind v0.30.0 is required"
27+
echo "To run Kubernetes 1.31+ kind v0.31.0 is required"
2828
return 1
2929
fi
3030
elif [ "$(echo "$K8S_VERSION" | tr . '\n' | head -n 2 | xargs -I @ printf '%05d' @)" \
@@ -524,7 +524,8 @@ EOF
524524
|| [ "$(printf %s "$K8S_VERSION" | cut -d . -f 1-2)" = 1.31 ] \
525525
|| [ "$(printf %s "$K8S_VERSION" | cut -d . -f 1-2)" = 1.32 ] \
526526
|| [ "$(printf %s "$K8S_VERSION" | cut -d . -f 1-2)" = 1.33 ] \
527-
|| [ "$(printf %s "$K8S_VERSION" | cut -d . -f 1-2)" = 1.34 ]
527+
|| [ "$(printf %s "$K8S_VERSION" | cut -d . -f 1-2)" = 1.34 ] \
528+
|| [ "$(printf %s "$K8S_VERSION" | cut -d . -f 1-2)" = 1.35 ]
528529
then
529530
CSI_DRIVER_HOST_PATH_PATH="$TARGET_PATH/csi-driver-host-path/deploy/kubernetes-1.30"
530531
fi
@@ -815,10 +816,11 @@ get_kind_image() {
815816

816817
get_kind_images() {
817818
cat << EOF
818-
v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a
819-
v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2
820-
v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
821-
v1.31.12sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2
819+
v1.35.0@sha256:452d707d4862f52530247495d180205e029056831160e22870e37e3f6c1ac31f
820+
v1.34.3@sha256:08497ee19eace7b4b5348db5c6a1591d7752b164530a36f855cb0f2bdcbadd48
821+
v1.33.7@sha256:d26ef333bdb2cbe9862a0f7c3803ecc7b4303d8cea8e814b481b09949d353040
822+
v1.32.11@sha256:5fc52d52a7b9574015299724bd68f183702956aa4a2116ae75a63cb574b35af8
823+
v1.31.14@sha256:6f86cf509dbb42767b6e79debc3f2c32e4ee01386f0489b3b2be24b0a55aac2b
822824
v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648
823825
v1.29.12@sha256:62c0672ba99a4afd7396512848d6fc382906b8f33349ae68fb1dbfe549f70dec
824826
v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251

stackgres-k8s/install/helm/stackgres-cluster/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: stackgres-cluster
33
version: "1.18.3-SNAPSHOT"
4-
kubeVersion: "1.18.0-0 - 1.34.x-0"
4+
kubeVersion: "1.18.0-0 - 1.35.x-0"
55
description: StackGres Cluster
66
keywords:
77
- stackgres

stackgres-k8s/install/helm/stackgres-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: stackgres-operator
33
version: "1.18.3-SNAPSHOT"
4-
kubeVersion: "1.18.0-0 - 1.34.x-O"
4+
kubeVersion: "1.18.0-0 - 1.35.x-O"
55
description: StackGres Operator
66
keywords:
77
- stackgres

0 commit comments

Comments
 (0)