Skip to content

Commit

Permalink
Set kindest/node image, Shoot K8s version for e2e tests and `envtes…
Browse files Browse the repository at this point in the history
…t` version to Kubernetes v1.28 (gardener#8533)
  • Loading branch information
oliver-goetz authored Sep 22, 2023
1 parent 6613f32 commit 69a7bd6
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 11 deletions.
3 changes: 1 addition & 2 deletions example/gardener-local/kind/cluster/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# TODO(oliver-goetz): Update to 1.28.0 after the merge of https://github.com/gardener/gardener/pull/8479 has been merged and released (after 1.80 has been released).
image: kindest/node:v1.27.3
image: kindest/node:v1.28.0

gardener:
apiserverRelay:
Expand Down
2 changes: 1 addition & 1 deletion hack/kind-up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ fi

kind create cluster \
--name "$CLUSTER_NAME" \
--image "kindest/node:v1.27.3" \
--image "kindest/node:v1.28.0" \
--config <(helm template $CHART --values "$PATH_CLUSTER_VALUES" $ADDITIONAL_ARGS --set "gardener.repositoryRoot"=$(dirname "$0")/..)

# adjust Kind's CRI default OCI runtime spec for new containers to include the cgroup namespace
Expand Down
2 changes: 1 addition & 1 deletion hack/prepare-envtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -o errexit
set -o nounset
set -o pipefail

ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.27"}
ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.28"}

echo "> Installing envtest tools@${ENVTEST_K8S_VERSION} with setup-envtest if necessary"
if ! command -v setup-envtest &> /dev/null ; then
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/gardener/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ func DefaultShoot(name string) *gardencorev1beta1.Shoot {
SecretBindingName: pointer.String("local"),
CloudProfileName: "local",
Kubernetes: gardencorev1beta1.Kubernetes{
// TODO(oliver-goetz): Update to 1.28.2 after the merge of https://github.com/gardener/gardener/pull/8479 has been merged and released (after 1.80 has been released).
Version: "1.27.1",
Version: "1.28.2",
EnableStaticTokenKubeconfig: pointer.Bool(false),
Kubelet: &gardencorev1beta1.KubeletConfig{
SerializeImagePulls: pointer.Bool(false),
Expand Down
6 changes: 2 additions & 4 deletions test/e2e/gardener/shoot/create_update_delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ var _ = Describe("Shoot Tests", Label("Shoot", "default"), func() {

// explicitly use one version below the latest supported minor version so that Kubernetes version update test can be
// performed
// TODO(oliver-goetz): Update to 1.27.1 after the merge of https://github.com/gardener/gardener/pull/8479 has been merged and released (after 1.80 has been released).
f.Shoot.Spec.Kubernetes.Version = "1.26.0"
f.Shoot.Spec.Kubernetes.Version = "1.27.1"

if !v1beta1helper.IsWorkerless(f.Shoot) {
// create two additional worker pools which explicitly specify the kubernetes version
Expand All @@ -53,8 +52,7 @@ var _ = Describe("Shoot Tests", Label("Shoot", "default"), func() {
pool2.Name += "2"
pool2.Kubernetes = &gardencorev1beta1.WorkerKubernetes{Version: &f.Shoot.Spec.Kubernetes.Version}
pool3.Name += "3"
// TODO(oliver-goetz): Update to 1.26.0 after the merge of https://github.com/gardener/gardener/pull/8479 has been merged and released (after 1.80 has been released).
pool3.Kubernetes = &gardencorev1beta1.WorkerKubernetes{Version: pointer.String("1.25.4")}
pool3.Kubernetes = &gardencorev1beta1.WorkerKubernetes{Version: pointer.String("1.26.0")}
f.Shoot.Spec.Provider.Workers = append(f.Shoot.Spec.Provider.Workers, *pool2, *pool3)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ var _ = BeforeSuite(func() {
Clock: clock.RealClock{},
MinimumObjectLifetime: pointer.Duration(0),
// Use the same version as the envtest package
TargetKubernetesVersion: semver.MustParse("1.27.0"),
TargetKubernetesVersion: semver.MustParse("1.28.0"),
}).AddToManager(mgr, mgr)).To(Succeed())

By("Start manager")
Expand Down

0 comments on commit 69a7bd6

Please sign in to comment.