Skip to content

Commit 1d3ba99

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2918 from chrischdi/pr-bump-k8s-1-30
🌱 Bump Kubernetes images to v1.30.0
2 parents fe94cb7 + 5ef0bac commit 1d3ba99

File tree

7 files changed

+32
-20
lines changed

7 files changed

+32
-20
lines changed

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,17 @@ production-like environments, it is highly recommended to build and use your own
133133
<td><a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.29.0/flatcar-stable-3602.2.3-kube-v1.29.0.ova">ova</a>, <a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.29.0/flatcar-stable-3602.2.3-kube-v1.29.0.ova.sha256">sha256</a></td>
134134
</tr>
135135

136+
<tr>
137+
<td>v1.30.0</td>
138+
<td>N/A</td>
139+
<td>N/A</td>
140+
<td><a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.30.0/ubuntu-2204-kube-v1.30.0.ova">ova</a>, <a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.30.0/ubuntu-2204-kube-v1.30.0.ova.sha256">sha256</a></td>
141+
<td>N/A</td>
142+
<td><a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.30.0/photon-5-kube-v1.30.0.ova">ova</a>, <a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.30.0/photon-5-kube-v1.30.0.ova.sha256">sha256</a></td>
143+
<td><a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.30.0/flatcar-stable-3815.2.2-kube-v1.30.0.ova">ova</a>, <a href="https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.30.0/flatcar-stable-3815.2.2-kube-v1.30.0.ova.sha256">sha256</a></td>
144+
</tr>
145+
146+
136147
</table>
137148

138149
A full list of the published machine images for CAPV may be obtained with the following command:

‎internal/test/helpers/vcsim/model.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ var (
3737
// TODO: consider if we want to make this extensible via the vCenterSimulator CR.
3838
"ubuntu-2204-kube-v1.28.0",
3939
"ubuntu-2204-kube-v1.29.0",
40+
"ubuntu-2204-kube-v1.30.0",
4041
}
4142
)
4243

‎packaging/flavorgen/cloudprovider/cpi/cpi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ spec:
155155
priorityClassName: system-node-critical
156156
containers:
157157
- name: vsphere-cpi
158-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.29.0
158+
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0-rc.0
159159
imagePullPolicy: IfNotPresent
160160
args:
161161
- --cloud-provider=vsphere

‎test/e2e/config/config-overrides-example.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ variables:
1313
VSPHERE_DATASTORE: "WorkloadDatastore"
1414
VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
1515
VSPHERE_NETWORK: "network-1"
16-
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
17-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3602.2.3-kube-v1.29.0"
16+
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
17+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0"
1818
CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10"
1919
# Only for clusterctl upgrade tests
2020
# WORKLOAD_CONTROL_PLANE_ENDPOINT_IP:
@@ -27,7 +27,7 @@ variables:
2727
VSPHERE2_SERVER: "vcenter2.vmware.com"
2828
VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF"
2929
VSPHERE2_RESOURCE_POOL: "ResourcePool"
30-
VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
30+
VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
3131
VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11"
3232
# Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
3333
# VSPHERE2_USERNAME:

‎test/e2e/config/vsphere.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ providers:
241241

242242
variables:
243243
# Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
244-
KUBERNETES_VERSION: "v1.29.0"
245-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.28.0"
246-
KUBERNETES_VERSION_UPGRADE_TO: "v1.29.0"
247-
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.30"
244+
KUBERNETES_VERSION: "v1.30.0"
245+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.0"
246+
KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0"
247+
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
248248
CPI_IMAGE_K8S_VERSION: "v1.30.0-rc.0"
249249
CNI: "./data/cni/calico/calico.yaml"
250250
EXP_CLUSTER_RESOURCE_SET: "true"
@@ -267,12 +267,12 @@ variables:
267267
VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "8"
268268
VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "8Gi"
269269
VSPHERE_CONTENT_LIBRARY: "capv"
270-
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0"
271-
VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.29.0"
270+
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0"
271+
VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.30.0"
272272
VSPHERE_NETWORK: "sddc-cgw-network-6"
273273
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-6"
274-
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
275-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3602.2.3-kube-v1.29.0"
274+
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
275+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0"
276276
VSPHERE_INSECURE_CSI: "true"
277277
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
278278
NODE_DRAIN_TIMEOUT: "60s"

‎test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
- op: replace
77
path: /spec/template/spec/template
88
valueFrom:
9-
# We have to fall back to v1.29.0 for the conformance latest ci test which uses
9+
# We have to fall back to v1.30.0 for the conformance latest ci test which uses
1010
# versions without corresponding templates like "v1.30.0-alpha.0.525+09a5049ca78502".
1111
template: |-
1212
{{- if eq .builtin.controlPlane.version "v1.28.0" -}}
1313
ubuntu-2204-kube-v1.28.0
1414
{{- else -}}{{- if eq .builtin.controlPlane.version "v1.29.0" -}}
1515
ubuntu-2204-kube-v1.29.0
1616
{{- else -}}
17-
ubuntu-2204-kube-v1.29.0
17+
ubuntu-2204-kube-v1.30.0
1818
{{- end -}}{{- end -}}
1919
selector:
2020
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -25,15 +25,15 @@
2525
- op: replace
2626
path: /spec/template/spec/template
2727
valueFrom:
28-
# We have to fall back to v1.29.0 for the conformance latest ci test which uses
28+
# We have to fall back to v1.30.0 for the conformance latest ci test which uses
2929
# versions without corresponding templates like "v1.30.0-alpha.0.525+09a5049ca78502".
3030
template: |-
3131
{{- if eq .builtin.machineDeployment.version "v1.28.0" -}}
3232
ubuntu-2204-kube-v1.28.0
3333
{{- else -}}{{- if eq .builtin.machineDeployment.version "v1.29.0" -}}
3434
ubuntu-2204-kube-v1.29.0
3535
{{- else -}}
36-
ubuntu-2204-kube-v1.29.0
36+
ubuntu-2204-kube-v1.30.0
3737
{{- end -}}{{- end -}}
3838
selector:
3939
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

‎test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
- op: replace
77
path: /spec/template/spec/imageName
88
valueFrom:
9-
# We have to fall back to v1.29.0 for the conformance latest ci test which uses
9+
# We have to fall back to v1.30.0 for the conformance latest ci test which uses
1010
# versions without corresponding templates like "v1.30.0-alpha.0.525+09a5049ca78502".
1111
template: |-
1212
{{- if eq .builtin.controlPlane.version "v1.28.0" -}}
1313
ubuntu-2204-kube-v1.28.0
1414
{{- else -}}{{- if eq .builtin.controlPlane.version "v1.29.0" -}}
1515
ubuntu-2204-kube-v1.29.0
1616
{{- else -}}
17-
ubuntu-2204-kube-v1.29.0
17+
ubuntu-2204-kube-v1.30.0
1818
{{- end -}}{{- end -}}
1919
selector:
2020
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
@@ -25,15 +25,15 @@
2525
- op: replace
2626
path: /spec/template/spec/imageName
2727
valueFrom:
28-
# We have to fall back to v1.29.0 for the conformance latest ci test which uses
28+
# We have to fall back to v1.30.0 for the conformance latest ci test which uses
2929
# versions without corresponding templates like "v1.30.0-alpha.0.525+09a5049ca78502".
3030
template: |-
3131
{{- if eq .builtin.machineDeployment.version "v1.28.0" -}}
3232
ubuntu-2204-kube-v1.28.0
3333
{{- else -}}{{- if eq .builtin.machineDeployment.version "v1.29.0" -}}
3434
ubuntu-2204-kube-v1.29.0
3535
{{- else -}}
36-
ubuntu-2204-kube-v1.29.0
36+
ubuntu-2204-kube-v1.30.0
3737
{{- end -}}{{- end -}}
3838
selector:
3939
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)