From 28f38cb430ed16b03f365637a2095e88001c2512 Mon Sep 17 00:00:00 2001 From: Danil-Grigorev Date: Fri, 16 Aug 2024 16:18:21 +0200 Subject: [PATCH] Use k8s 1.30.4 Signed-off-by: Danil-Grigorev --- .github/workflows/test_chart.yaml | 2 +- hack/ensure-kubectl.sh | 2 +- scripts/kind-cluster-with-extramounts.yaml | 2 +- test/e2e/config/operator.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_chart.yaml b/.github/workflows/test_chart.yaml index 4b6dc7593..97ec9b999 100644 --- a/.github/workflows/test_chart.yaml +++ b/.github/workflows/test_chart.yaml @@ -59,7 +59,7 @@ jobs: uses: helm/kind-action@v1.9.0 with: cluster_name: kind - node_image: kindest/node:v1.30.0 + node_image: kindest/node:v1.30.4 - name: Add local docker image run: kind load docker-image ${{ env.MANIFEST_IMG }}:${{ env.TAG }} diff --git a/hack/ensure-kubectl.sh b/hack/ensure-kubectl.sh index 04e8c5f89..ebecd27ca 100755 --- a/hack/ensure-kubectl.sh +++ b/hack/ensure-kubectl.sh @@ -26,7 +26,7 @@ fi source "$(dirname "${BASH_SOURCE[0]}")/utils.sh" GOPATH_BIN="$(go env GOPATH)/bin/" -MINIMUM_KUBECTL_VERSION=v1.30.0 +MINIMUM_KUBECTL_VERSION=v1.30.4 goarch="$(go env GOARCH)" goos="$(go env GOOS)" diff --git a/scripts/kind-cluster-with-extramounts.yaml b/scripts/kind-cluster-with-extramounts.yaml index f108af76b..a1d516577 100644 --- a/scripts/kind-cluster-with-extramounts.yaml +++ b/scripts/kind-cluster-with-extramounts.yaml @@ -3,7 +3,7 @@ apiVersion: kind.x-k8s.io/v1alpha4 name: capi-test nodes: - role: control-plane - image: kindest/node:v1.30.0 + image: kindest/node:v1.30.4 extraMounts: - hostPath: /var/run/docker.sock containerPath: /var/run/docker.sock diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml index 29311b5ff..36c4c3277 100644 --- a/test/e2e/config/operator.yaml +++ b/test/e2e/config/operator.yaml @@ -35,8 +35,8 @@ variables: ARTIFACTS_FOLDER: "_artifacts" HELM_BINARY_PATH: "helm" HELM_EXTRA_VALUES_FOLDER: "/tmp" - KUBERNETES_VERSION: "v1.30.3" - KUBERNETES_MANAGEMENT_VERSION: "v1.30.0" + KUBERNETES_VERSION: "v1.30.4" + KUBERNETES_MANAGEMENT_VERSION: "v1.30.4" RKE2_VERSION: "v1.30.3+rke2r1" KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2" RANCHER_HOSTNAME: "localhost" @@ -49,7 +49,7 @@ variables: TURTLES_PATH: "turtles/rancher-turtles" TURTLES_REPO_NAME: "turtles" TURTLES_URL: https://rancher.github.io/turtles - CPI_IMAGE_K8S_VERSION: "v1.30.0" + CPI_IMAGE_K8S_VERSION: "v1.30.4" RANCHER_REPO_NAME: "rancher-latest" RANCHER_ALPHA_REPO_NAME: "rancher-alpha" RANCHER_URL: "https://releases.rancher.com/server-charts/latest"