Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Bump Kubernetes version used for testing to v1.31.0-beta.0 #10922

Merged
merged 2 commits into from
Jul 23, 2024
Merged

✨ Bump Kubernetes version used for testing to v1.31.0-beta.0 #10922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30878db
Bump Kubernetes version used for testing to v1.31.0-beta.0
chrischdi Jul 22, 2024
f36777c
allow pre versions for kind cluster
chrischdi Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/e2e/config/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,12 +353,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.30.0"
KUBERNETES_VERSION: "v1.30.0"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.4"
KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0"
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0-beta.0"
KUBERNETES_VERSION: "v1.31.0-beta.0"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.2"
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0-beta.0"
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
ETCD_VERSION_UPGRADE_TO: "3.5.14-0"
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
DOCKER_SERVICE_DOMAIN: "cluster.local"
IP_FAMILY: "dual"
Expand Down
5 changes: 3 additions & 2 deletions test/framework/bootstrap/kind_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"os"
"path/filepath"

"github.com/blang/semver/v4"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
kindv1 "sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
Expand All @@ -32,7 +33,6 @@ import (
"sigs.k8s.io/cluster-api/test/framework/internal/log"
"sigs.k8s.io/cluster-api/test/infrastructure/container"
kindmapper "sigs.k8s.io/cluster-api/test/infrastructure/kind"
"sigs.k8s.io/cluster-api/util/version"
)

// CreateKindBootstrapClusterAndLoadImagesInput is the input for CreateKindBootstrapClusterAndLoadImages.
Expand Down Expand Up @@ -68,10 +68,11 @@ func CreateKindBootstrapClusterAndLoadImages(ctx context.Context, input CreateKi

options := []KindClusterOption{}
if input.KubernetesVersion != "" {
semVer, err := version.ParseMajorMinorPatchTolerant(input.KubernetesVersion)
semVer, err := semver.ParseTolerant(input.KubernetesVersion)
if err != nil {
Expect(err).ToNot(HaveOccurred(), "could not parse KubernetesVersion version")
}

kindMapping := kindmapper.GetMapping(semVer, "")

options = append(options, WithNodeImage(kindMapping.Image))
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/machine-pool.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.30.0
version: v1.31.0-beta.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -77,7 +77,7 @@ spec:
replicas: 2
template:
spec:
version: v1.30.0
version: v1.31.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.30.0
version: v1.31.0-beta.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.30.0
version: v1.31.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
name: controlplane-0
namespace: default
spec:
version: v1.30.0
version: v1.31.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down Expand Up @@ -76,7 +76,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.30.0
version: v1.31.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.30.0
version: v1.31.0-beta.0
machineTemplate:
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.30.0
version: v1.31.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
Loading