From 50d3d4983bfb51ba30b96e148320e2fdcc46dbce Mon Sep 17 00:00:00 2001 From: Maciej Golaszewski Date: Thu, 28 Nov 2024 16:51:26 +0100 Subject: [PATCH] wip1 --- go.mod | 2 +- go.sum | 4 ++-- templates/docker/Dockerfile | 2 +- test/e2e/config/ck8s-docker.yaml | 12 ++++++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 8940ca5e..ad75b917 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/canonical/cluster-api-k8s go 1.22.6 require ( - github.com/canonical/k8s-snap-api v1.0.11 + github.com/canonical/k8s-snap-api v1.0.14 github.com/go-logr/logr v1.4.1 github.com/google/uuid v1.4.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index a69bd9a4..ee44a18f 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/canonical/k8s-snap-api v1.0.11 h1:nGtwrUQBLiaL3HUXFx2gb4kq6qVpl2yNwMwHVX0dEok= -github.com/canonical/k8s-snap-api v1.0.11/go.mod h1:LDPoIYCeYnfgOFrwVPJ/4edGU264w7BB7g0GsVi36AY= +github.com/canonical/k8s-snap-api v1.0.14 h1:x02BAQWOFxV0eV3BHToxwDlNhYwro/vduO+Oyoxi5fk= +github.com/canonical/k8s-snap-api v1.0.14/go.mod h1:LDPoIYCeYnfgOFrwVPJ/4edGU264w7BB7g0GsVi36AY= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= diff --git a/templates/docker/Dockerfile b/templates/docker/Dockerfile index 7a6b3d28..36071e44 100644 --- a/templates/docker/Dockerfile +++ b/templates/docker/Dockerfile @@ -20,7 +20,7 @@ ## See https://kind.sigs.k8s.io/docs/design/node-image/ ## ## !!!IMPORTANT!!! Keep this up to date with the minor version of k8s-snap. -ARG BASE=kindest/node:v1.30.0 +ARG BASE=kindest/node:v1.31.0 ## NOTE(neoaggelos): Builder uses the ubuntu:20.04 as base image ## diff --git a/test/e2e/config/ck8s-docker.yaml b/test/e2e/config/ck8s-docker.yaml index 85b6b1ca..3e9601bf 100644 --- a/test/e2e/config/ck8s-docker.yaml +++ b/test/e2e/config/ck8s-docker.yaml @@ -84,11 +84,15 @@ providers: targetName: "metadata.yaml" variables: - KUBERNETES_VERSION_MANAGEMENT: "v1.28.0" - KUBERNETES_VERSION: "v1.29.6" - KUBERNETES_VERSION_UPGRADE_TO: "v1.30.3" +# KUBERNETES_VERSION_MANAGEMENT: "v1.28.0" +# KUBERNETES_VERSION: "v1.29.6" +# KUBERNETES_VERSION_UPGRADE_TO: "v1.30.3" + KUBERNETES_VERSION_MANAGEMENT: "v1.31.0" + KUBERNETES_VERSION: "v1.31.0" + KUBERNETES_VERSION_UPGRADE_TO: "v1.31.1" IP_FAMILY: "IPv4" - KIND_IMAGE_VERSION: "v1.28.0" +# KIND_IMAGE_VERSION: "v1.28.0" + KIND_IMAGE_VERSION: "v1.30.0" IN_PLACE_UPGRADE_OPTION: "localPath=/k8s/upgrade/bin/kubernetes" intervals: