Skip to content

Commit

Permalink
wip1
Browse files Browse the repository at this point in the history
  • Loading branch information
Maciej Golaszewski committed Nov 28, 2024
1 parent 5188821 commit 50d3d49
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion templates/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
##
Expand Down
12 changes: 8 additions & 4 deletions test/e2e/config/ck8s-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 50d3d49

Please sign in to comment.