Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions test/e2e/config/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -371,14 +371,14 @@ 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.34.0"
KUBERNETES_VERSION: "v1.34.0"
KUBERNETES_VERSION_CHAINED_UPGRADE_FROM: "v1.30.0" # Should always be KUBERNETES_VERSION_UPGRADE_TO - 4 minor
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.4"
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0"
KUBERNETES_VERSION_MANAGEMENT: "v1.35.0-beta.0"
KUBERNETES_VERSION: "v1.35.0-beta.0"
KUBERNETES_VERSION_CHAINED_UPGRADE_FROM: "v1.31.0" # Should always be KUBERNETES_VERSION_UPGRADE_TO - 4 minor
KUBERNETES_VERSION_UPGRADE_FROM: "v1.34.2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
KUBERNETES_VERSION_UPGRADE_FROM: "v1.34.2"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.34.0"

There is no pre-built kindest/node image for v1.34.2. Let's use v1.34.0 to avoid building a kindest/node v1.34.2 image on every single CI run

KUBERNETES_VERSION_UPGRADE_TO: "v1.35.0-beta.0"
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.35"
ETCD_VERSION_UPGRADE_TO: "3.6.4-0"
COREDNS_VERSION_UPGRADE_TO: "v1.12.1"
ETCD_VERSION_UPGRADE_TO: "3.6.5-0"
COREDNS_VERSION_UPGRADE_TO: "v1.13.1"
DOCKER_SERVICE_DOMAIN: "cluster.local"
IP_FAMILY: "dual"
DOCKER_SERVICE_CIDRS: "10.128.0.0/12"
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/machine-pool.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.34.0
version: v1.35.0-beta.0
machineTemplate:
spec:
infrastructureRef:
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
replicas: 2
template:
spec:
version: v1.34.0
version: v1.35.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.34.0
version: v1.35.0-beta.0
machineTemplate:
spec:
infrastructureRef:
Expand Down Expand Up @@ -92,7 +92,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.34.0
version: v1.35.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metadata:
name: controlplane-0
namespace: default
spec:
version: v1.34.0
version: v1.35.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down Expand Up @@ -74,7 +74,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.34.0
version: v1.35.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
4 changes: 2 additions & 2 deletions test/infrastructure/docker/examples/simple-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ metadata:
namespace: default
spec:
replicas: 1
version: v1.34.0
version: v1.35.0-beta.0
machineTemplate:
spec:
infrastructureRef:
Expand Down Expand Up @@ -83,7 +83,7 @@ spec:
cluster.x-k8s.io/cluster-name: my-cluster
template:
spec:
version: v1.34.0
version: v1.35.0-beta.0
clusterName: my-cluster
bootstrap:
configRef:
Expand Down
Loading