Skip to content

Commit aadda55

Browse files
committed
WIP: Use k8s v1.28 in tests
TODO: flatcar
1 parent d4baeb1 commit aadda55

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
5454
SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup-envtest
5555

5656
# Kubebuilder
57-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.25.0
57+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
5858
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
5959
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
# https://docs.openstack.org/glance/latest/admin/quotas.html
6363
IMAGE_URLS="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/amphora/2022-12-05/amphora-x64-haproxy.qcow2,"
6464
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,"
65-
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,"
65+
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2023-09-29/ubuntu-2204-kube-v1.28.2.img,"
6666
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3602.2.0-kube-v1.27.2.img"
6767

6868
[[post-config|$NOVA_CONF]]

test/e2e/data/e2e_conf.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ providers:
164164
variables:
165165
# used to ensure we deploy to the correct management cluster
166166
KUBE_CONTEXT: "kind-capo-e2e"
167-
KUBERNETES_VERSION: "v1.27.2"
167+
KUBERNETES_VERSION: "v1.28.2"
168168
CNI: "../../data/cni/calico.yaml"
169169
CCM: "../../data/ccm/cloud-controller-manager.yaml"
170170
EXP_CLUSTER_RESOURCE_SET: "true"
@@ -178,14 +178,14 @@ variables:
178178
OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
179179
OPENSTACK_FAILURE_DOMAIN: "testaz1"
180180
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
181-
OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.27.2"
181+
OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.28.2"
182182
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
183183
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
184184
OPENSTACK_EXTERNAL_NETWORK_ID: ""
185185
OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
186186
CONFORMANCE_WORKER_MACHINE_COUNT: "5"
187187
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
188-
INIT_WITH_KUBERNETES_VERSION: "v1.27.2"
188+
INIT_WITH_KUBERNETES_VERSION: "v1.28.2"
189189
E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"
190190
# The default user for SSH connections from bastion to machines
191191
SSH_USER_MACHINE: "ubuntu"

0 commit comments

Comments
 (0)