From d1e17efea2f777cb411ec97ed8fb55150762611b Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Wed, 12 Apr 2023 19:19:04 +0300 Subject: [PATCH] Use k8s v1.27.0 in CAPD and tests Signed-off by: Furkat Gofurov (furkat.gofurov@suse.com) --- test/e2e/clusterctl_upgrade_test.go | 4 ++-- test/e2e/config/docker.yaml | 12 ++++++------ test/framework/bootstrap/kind_provider.go | 2 +- .../infrastructure/docker/examples/machine-pool.yaml | 4 ++-- .../docker/examples/simple-cluster-ipv6.yaml | 4 ++-- .../docker/examples/simple-cluster-without-kcp.yaml | 4 ++-- .../docker/examples/simple-cluster.yaml | 4 ++-- .../infrastructure/docker/internal/docker/machine.go | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go index ed566bbdc530..2f89c5d07703 100644 --- a/test/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/clusterctl_upgrade_test.go @@ -209,7 +209,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.4=>current)", func() { SkipCleanup: skipCleanup, InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}", InitWithProvidersContract: "v1beta1", - InitWithKubernetesVersion: "v1.26.0", + InitWithKubernetesVersion: "v1.27.0", MgmtFlavor: "topology", WorkloadFlavor: "", // This check ensures that ownerReference apiVersions are updated for all types after the upgrade. @@ -237,7 +237,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.4=>cur SkipCleanup: skipCleanup, InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/clusterctl-{OS}-{ARCH}", InitWithProvidersContract: "v1beta1", - InitWithKubernetesVersion: "v1.26.0", + InitWithKubernetesVersion: "v1.27.0", MgmtFlavor: "topology", WorkloadFlavor: "topology", // This check ensures that ownerReference apiVersions are updated for all types after the upgrade. diff --git a/test/e2e/config/docker.yaml b/test/e2e/config/docker.yaml index be0c10e84f69..3525a5779331 100644 --- a/test/e2e/config/docker.yaml +++ b/test/e2e/config/docker.yaml @@ -323,12 +323,12 @@ variables: # allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation. # The following Kubernetes versions should be the latest versions with already published kindest/node images. # This avoids building node images in the default case which improves the test duration significantly. - KUBERNETES_VERSION_MANAGEMENT: "v1.26.0" - KUBERNETES_VERSION: "v1.26.0" - KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.3" - KUBERNETES_VERSION_UPGRADE_TO: "v1.26.0" - ETCD_VERSION_UPGRADE_TO: "3.5.6-0" - COREDNS_VERSION_UPGRADE_TO: "v1.9.3" + KUBERNETES_VERSION_MANAGEMENT: "v1.27.0" + KUBERNETES_VERSION: "v1.27.0" + KUBERNETES_VERSION_UPGRADE_FROM: "v1.26.3" + KUBERNETES_VERSION_UPGRADE_TO: "v1.27.0" + ETCD_VERSION_UPGRADE_TO: "3.5.7-0" + COREDNS_VERSION_UPGRADE_TO: "v1.10.1" DOCKER_SERVICE_DOMAIN: "cluster.local" IP_FAMILY: "IPv4" DOCKER_SERVICE_CIDRS: "10.128.0.0/12" diff --git a/test/framework/bootstrap/kind_provider.go b/test/framework/bootstrap/kind_provider.go index eb13eeefb050..a71580e1afc9 100644 --- a/test/framework/bootstrap/kind_provider.go +++ b/test/framework/bootstrap/kind_provider.go @@ -37,7 +37,7 @@ const ( DefaultNodeImageRepository = "kindest/node" // DefaultNodeImageVersion is the default Kubernetes version to be used for creating a kind cluster. - DefaultNodeImageVersion = "v1.26.0" + DefaultNodeImageVersion = "v1.27.0" ) // KindClusterOption is a NewKindClusterProvider option. diff --git a/test/infrastructure/docker/examples/machine-pool.yaml b/test/infrastructure/docker/examples/machine-pool.yaml index 4bade93285b9..add1af85a1db 100644 --- a/test/infrastructure/docker/examples/machine-pool.yaml +++ b/test/infrastructure/docker/examples/machine-pool.yaml @@ -35,7 +35,7 @@ metadata: namespace: default spec: replicas: 1 - version: v1.26.0 + version: v1.27.0 machineTemplate: infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -80,7 +80,7 @@ spec: replicas: 2 template: spec: - version: v1.26.0 + version: v1.27.0 clusterName: my-cluster bootstrap: configRef: diff --git a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml index 95cda19c039e..dbaea5b219ac 100644 --- a/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-ipv6.yaml @@ -35,7 +35,7 @@ metadata: namespace: default spec: replicas: 1 - version: v1.26.0 + version: v1.27.0 machineTemplate: infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -90,7 +90,7 @@ spec: cluster.x-k8s.io/cluster-name: my-cluster template: spec: - version: v1.26.0 + version: v1.27.0 clusterName: my-cluster bootstrap: configRef: diff --git a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml index 10ca83cdc472..7c1d90a8b1c1 100644 --- a/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml +++ b/test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml @@ -32,7 +32,7 @@ metadata: name: controlplane-0 namespace: default spec: - version: v1.26.0 + version: v1.27.0 clusterName: my-cluster bootstrap: configRef: @@ -80,7 +80,7 @@ spec: cluster.x-k8s.io/cluster-name: my-cluster template: spec: - version: v1.26.0 + version: v1.27.0 clusterName: my-cluster bootstrap: configRef: diff --git a/test/infrastructure/docker/examples/simple-cluster.yaml b/test/infrastructure/docker/examples/simple-cluster.yaml index 38db43941beb..5daf6ddf49d1 100644 --- a/test/infrastructure/docker/examples/simple-cluster.yaml +++ b/test/infrastructure/docker/examples/simple-cluster.yaml @@ -35,7 +35,7 @@ metadata: namespace: default spec: replicas: 1 - version: v1.26.0 + version: v1.27.0 machineTemplate: infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -83,7 +83,7 @@ spec: cluster.x-k8s.io/cluster-name: my-cluster template: spec: - version: v1.26.0 + version: v1.27.0 clusterName: my-cluster bootstrap: configRef: diff --git a/test/infrastructure/docker/internal/docker/machine.go b/test/infrastructure/docker/internal/docker/machine.go index 054483264a9d..6a220d1aa302 100644 --- a/test/infrastructure/docker/internal/docker/machine.go +++ b/test/infrastructure/docker/internal/docker/machine.go @@ -50,7 +50,7 @@ import ( const ( defaultImageName = "kindest/node" - defaultImageTag = "v1.26.0" + defaultImageTag = "v1.27.0" ) type nodeCreator interface {