Skip to content

Commit fa97253

Browse files
authored
Merge pull request #2103 from Nordix/lentzi90/bump-k8s-v1.29.5
🌱 E2E: Bump Kubernetes to v1.29.5
2 parents 100693b + 94b2c1f commit fa97253

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# Neutron
3535
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
3636
ENABLED_SERVICES+=,q-svc,neutron-trunk,ovn-controller,ovs-vswitchd,ovn-northd,ovsdb-server,q-ovn-metadata-agent
37-
37+
3838
DISABLED_SERVICES=q-agt,q-dhcp,q-l3,q-meta,q-metering
3939
PUBLIC_BRIDGE_MTU=${MTU}
4040
ENABLE_CHASSIS_AS_GW="True"
@@ -68,9 +68,9 @@
6868
# https://docs.openstack.org/glance/latest/admin/quotas.html
6969
IMAGE_URLS="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/amphora/2022-12-05/amphora-x64-haproxy.qcow2,"
7070
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img,"
71-
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2023-09-29/ubuntu-2204-kube-v1.27.2.img,"
7271
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-01-10/ubuntu-2204-kube-v1.28.5.img,"
73-
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3815.2.0-kube-v1.28.5.img,"
72+
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-05-28/ubuntu-2204-kube-v1.29.5.img,"
73+
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3815.2.2-kube-v1.29.5.img,"
7474
IMAGE_URLS+="https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img"
7575

7676
[[post-config|$NOVA_CONF]]

test/e2e/data/e2e_conf.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ providers:
150150
variables:
151151
# used to ensure we deploy to the correct management cluster
152152
KUBE_CONTEXT: "kind-capo-e2e"
153-
KUBERNETES_VERSION: "v1.28.5"
154-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.2"
155-
KUBERNETES_VERSION_UPGRADE_TO: "v1.28.5"
153+
KUBERNETES_VERSION: "v1.29.5"
154+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.28.5"
155+
KUBERNETES_VERSION_UPGRADE_TO: "v1.29.5"
156156
# NOTE: To see default images run kubeadm config images list (optionally with --kubernetes-version=vX.Y.Z)
157157
ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
158158
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
@@ -172,22 +172,22 @@ variables:
172172
OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
173173
OPENSTACK_FAILURE_DOMAIN: "testaz1"
174174
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
175-
OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.28.5"
176-
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.27.2"
175+
OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.29.5"
176+
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.28.5"
177177
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
178178
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
179179
# The default external network created by devstack
180180
OPENSTACK_EXTERNAL_NETWORK_NAME: "public"
181181
OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
182182
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
183183
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
184-
INIT_WITH_KUBERNETES_VERSION: "v1.28.5"
184+
INIT_WITH_KUBERNETES_VERSION: "v1.29.5"
185185
E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"
186186
# The default user for SSH connections from bastion to machines
187187
SSH_USER_MACHINE: "ubuntu"
188188
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
189189
# The Flatcar image produced by the image-builder
190-
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.0-kube-v1.28.5"
190+
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.2-kube-v1.29.5"
191191
# A plain Flatcar from the Flatcar releases server
192192
FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"
193193

0 commit comments

Comments
 (0)