Skip to content

Commit b4112f7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2600 from Nordix/lentzi90/e2e-k8s-version
🌱 Bump e2e k8s versions and update templates
2 parents 922aa7a + 3f2f020 commit b4112f7

File tree

8 files changed

+31
-49
lines changed

8 files changed

+31
-49
lines changed

‎kustomize/v1beta1/default/cluster-template.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ spec:
7373
cloud-provider: external
7474
provider-id: "openstack:///'{{ instance_id }}'"
7575
clusterConfiguration:
76-
apiServer:
77-
extraArgs:
78-
cloud-provider: external
7976
controllerManager:
8077
extraArgs:
8178
cloud-provider: external

‎kustomize/v1beta1/flatcar-sysext/patch-flatcar.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ spec:
3838
mode: 0644
3939
contents:
4040
remote:
41-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf
41+
url: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION%.*}.conf
4242
- path: /etc/sysupdate.d/noop.conf
4343
mode: 0644
4444
contents:
4545
remote:
46-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/noop.conf
46+
url: https://extensions.flatcar.org/extensions/noop.conf
4747
- path: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
4848
contents:
4949
remote:
50-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
50+
url: https://extensions.flatcar.org/extensions/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
5151
systemd:
5252
units:
5353
- name: systemd-sysupdate.service
@@ -82,10 +82,10 @@ spec:
8282
[Service]
8383
EnvironmentFile=/run/metadata/flatcar
8484
preKubeadmCommands:
85-
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
86-
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
87-
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
88-
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
85+
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
86+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
87+
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
88+
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
8989
---
9090
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
9191
kind: KubeadmConfigTemplate
@@ -100,10 +100,10 @@ spec:
100100
kubeletExtraArgs:
101101
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
102102
preKubeadmCommands:
103-
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
104-
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
105-
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
106-
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
103+
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
104+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
105+
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
106+
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
107107
format: ignition
108108
ignition:
109109
containerLinuxConfig:
@@ -118,16 +118,16 @@ spec:
118118
mode: 0644
119119
contents:
120120
remote:
121-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf
121+
url: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION%.*}.conf
122122
- path: /etc/sysupdate.d/noop.conf
123123
mode: 0644
124124
contents:
125125
remote:
126-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/noop.conf
126+
url: https://extensions.flatcar.org/extensions/noop.conf
127127
- path: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
128128
contents:
129129
remote:
130-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
130+
url: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
131131
systemd:
132132
units:
133133
- name: systemd-sysupdate.service

‎templates/cluster-template-flatcar-sysext.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ spec:
3030
mode: 0644
3131
contents:
3232
remote:
33-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf
33+
url: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION%.*}.conf
3434
- path: /etc/sysupdate.d/noop.conf
3535
mode: 0644
3636
contents:
3737
remote:
38-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/noop.conf
38+
url: https://extensions.flatcar.org/extensions/noop.conf
3939
- path: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
4040
contents:
4141
remote:
42-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
42+
url: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
4343
systemd:
4444
units:
4545
- name: systemd-sysupdate.service
@@ -135,9 +135,6 @@ metadata:
135135
spec:
136136
kubeadmConfigSpec:
137137
clusterConfiguration:
138-
apiServer:
139-
extraArgs:
140-
cloud-provider: external
141138
controllerManager:
142139
extraArgs:
143140
cloud-provider: external
@@ -156,16 +153,16 @@ spec:
156153
mode: 0644
157154
contents:
158155
remote:
159-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION%.*}.conf
156+
url: https://extensions.flatcar.org/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION%.*}.conf
160157
- path: /etc/sysupdate.d/noop.conf
161158
mode: 0644
162159
contents:
163160
remote:
164-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/noop.conf
161+
url: https://extensions.flatcar.org/extensions/noop.conf
165162
- path: /opt/extensions/kubernetes/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
166163
contents:
167164
remote:
168-
url: https://github.com/flatcar/sysext-bakery/releases/download/latest/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
165+
url: https://extensions.flatcar.org/extensions/kubernetes-${KUBERNETES_VERSION}-x86-64.raw
169166
systemd:
170167
units:
171168
- name: systemd-sysupdate.service

‎templates/cluster-template-flatcar.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ metadata:
9797
spec:
9898
kubeadmConfigSpec:
9999
clusterConfiguration:
100-
apiServer:
101-
extraArgs:
102-
cloud-provider: external
103100
controllerManager:
104101
extraArgs:
105102
cloud-provider: external

‎templates/cluster-template-without-lb.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ metadata:
7373
spec:
7474
kubeadmConfigSpec:
7575
clusterConfiguration:
76-
apiServer:
77-
extraArgs:
78-
cloud-provider: external
7976
controllerManager:
8077
extraArgs:
8178
cloud-provider: external

‎templates/cluster-template.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ metadata:
7373
spec:
7474
kubeadmConfigSpec:
7575
clusterConfiguration:
76-
apiServer:
77-
extraArgs:
78-
cloud-provider: external
7976
controllerManager:
8077
extraArgs:
8178
cloud-provider: external

‎templates/clusterclass-dev-test.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,6 @@ spec:
308308
spec:
309309
kubeadmConfigSpec:
310310
clusterConfiguration:
311-
apiServer:
312-
extraArgs:
313-
cloud-provider: external
314311
controllerManager:
315312
extraArgs:
316313
cloud-provider: external

‎test/e2e/data/e2e_conf.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ providers:
161161
variables:
162162
# used to ensure we deploy to the correct management cluster
163163
KUBE_CONTEXT: "kind-capo-e2e"
164-
KUBERNETES_VERSION: "v1.31.2"
165-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.1"
166-
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.2"
164+
KUBERNETES_VERSION: "v1.33.1"
165+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.5"
166+
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.1"
167167
# NOTE: To see default images run kubeadm config images list (optionally with --kubernetes-version=vX.Y.Z)
168-
ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
169-
COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
168+
ETCD_VERSION_UPGRADE_TO: "3.5.21-0"
169+
COREDNS_VERSION_UPGRADE_TO: "v1.12.0"
170170
CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "upgrade-to-control-plane"
171171
WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "upgrade-to-md-0"
172172
CNI: "../../data/cni/calico.yaml"
@@ -186,10 +186,10 @@ variables:
186186
OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
187187
OPENSTACK_FAILURE_DOMAIN: "testaz1"
188188
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
189-
OPENSTACK_IMAGE_NAME: "ubuntu-2404-kube-v1.31.2"
190-
OPENSTACK_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-11-21/ubuntu-2404-kube-v1.31.2.img
191-
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.30.1"
192-
OPENSTACK_IMAGE_URL_UPGRADE_FROM: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-05-28/ubuntu-2204-kube-v1.30.1.img
189+
OPENSTACK_IMAGE_NAME: "ubuntu-2404-kube-v1.33.1"
190+
OPENSTACK_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/ubuntu-2404-kube-v1.33.1
191+
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2404-kube-v1.32.5"
192+
OPENSTACK_IMAGE_URL_UPGRADE_FROM: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/ubuntu-2404-kube-v1.32.5
193193
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
194194
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
195195
# The default external network created by devstack
@@ -202,8 +202,8 @@ variables:
202202
SSH_USER_MACHINE: "ubuntu"
203203
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
204204
# The Flatcar image produced by the image-builder
205-
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-4152.2.0-kube-v1.31.2"
206-
OPENSTACK_FLATCAR_IMAGE_URL: "https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-4152.2.0-kube-v1.31.2.img"
205+
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-4152.2.3-kube-v1.33.1"
206+
OPENSTACK_FLATCAR_IMAGE_URL: "https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-4152.2.3-kube-v1.33.1"
207207
# A plain Flatcar from the Flatcar releases server
208208
FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"
209209
FLATCAR_IMAGE_URL: https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img

0 commit comments

Comments
 (0)