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

🌱 E2E: Bump Kubernetes to v1.29.5 #2103

Merged
merged 1 commit into from
May 29, 2024
Merged

🌱 E2E: Bump Kubernetes to v1.29.5 #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions hack/ci/cloud-init/controller.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Neutron
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
ENABLED_SERVICES+=,q-svc,neutron-trunk,ovn-controller,ovs-vswitchd,ovn-northd,ovsdb-server,q-ovn-metadata-agent

DISABLED_SERVICES=q-agt,q-dhcp,q-l3,q-meta,q-metering
PUBLIC_BRIDGE_MTU=${MTU}
ENABLE_CHASSIS_AS_GW="True"
Expand Down Expand Up @@ -68,9 +68,9 @@
# https://docs.openstack.org/glance/latest/admin/quotas.html
IMAGE_URLS="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/amphora/2022-12-05/amphora-x64-haproxy.qcow2,"
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,"
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,"
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,"
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,"
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,"
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,"
IMAGE_URLS+="https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img"

[[post-config|$NOVA_CONF]]
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/data/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ providers:
variables:
# used to ensure we deploy to the correct management cluster
KUBE_CONTEXT: "kind-capo-e2e"
KUBERNETES_VERSION: "v1.28.5"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.2"
KUBERNETES_VERSION_UPGRADE_TO: "v1.28.5"
KUBERNETES_VERSION: "v1.29.5"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.28.5"
KUBERNETES_VERSION_UPGRADE_TO: "v1.29.5"
# NOTE: To see default images run kubeadm config images list (optionally with --kubernetes-version=vX.Y.Z)
ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
Expand All @@ -172,22 +172,22 @@ variables:
OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
OPENSTACK_FAILURE_DOMAIN: "testaz1"
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.28.5"
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.27.2"
OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.29.5"
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.28.5"
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
# The default external network created by devstack
OPENSTACK_EXTERNAL_NETWORK_NAME: "public"
OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
INIT_WITH_KUBERNETES_VERSION: "v1.28.5"
INIT_WITH_KUBERNETES_VERSION: "v1.29.5"
E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"
# The default user for SSH connections from bastion to machines
SSH_USER_MACHINE: "ubuntu"
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
# The Flatcar image produced by the image-builder
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.0-kube-v1.28.5"
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.2-kube-v1.29.5"
# A plain Flatcar from the Flatcar releases server
FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"

Expand Down