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

[release-1.11] 🌱 Bump ubuntu to 24.04 images #3169

Merged
merged 1 commit into from
Aug 26, 2024
Merged

[release-1.11] 🌱 Bump ubuntu to 24.04 images #3169

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
2 changes: 1 addition & 1 deletion internal/test/helpers/vcsim/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var (
"ubuntu-2204-kube-v1.28.0",
"ubuntu-2204-kube-v1.29.0",
"ubuntu-2204-kube-v1.30.0",
"ubuntu-2204-kube-v1.31.0",
"ubuntu-2404-kube-v1.31.0",
}
)

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/config-overrides-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ variables:
VSPHERE_DATASTORE: "WorkloadDatastore"
VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
VSPHERE_NETWORK: "network-1"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0"
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.31.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0"
CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10"
# Only for clusterctl upgrade tests
Expand All @@ -27,7 +27,7 @@ variables:
VSPHERE2_SERVER: "vcenter2.vmware.com"
VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF"
VSPHERE2_RESOURCE_POOL: "ResourcePool"
VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.31.0"
VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.31.0"
VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11"
# Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
# VSPHERE2_USERNAME:
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/config/vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,11 @@ variables:
VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "8"
VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "8Gi"
VSPHERE_CONTENT_LIBRARY: "capv"
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2204-kube-v1.31.0"
VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.31.0"
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0"
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.31.0"
VSPHERE_NETWORK: "sddc-cgw-network-10"
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0"
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.31.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0"
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
NODE_DRAIN_TIMEOUT: "60s"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{- else if eq .builtin.controlPlane.version "v1.30.0" -}}
ubuntu-2204-kube-v1.30.0
{{- else -}}
ubuntu-2204-kube-v1.31.0
ubuntu-2404-kube-v1.31.0
{{- end -}}
selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand All @@ -37,7 +37,7 @@
{{- else if eq .builtin.machineDeployment.version "v1.30.0" -}}
ubuntu-2204-kube-v1.30.0
{{- else -}}
ubuntu-2204-kube-v1.31.0
ubuntu-2404-kube-v1.31.0
{{- end -}}
selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand Down
4 changes: 2 additions & 2 deletions .../e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{{- else if eq .builtin.controlPlane.version "v1.30.0" -}}
ubuntu-2204-kube-v1.30.0
{{- else -}}
ubuntu-2204-kube-v1.31.0
ubuntu-2404-kube-v1.31.0
{{- end -}}
selector:
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
Expand All @@ -37,7 +37,7 @@
{{- else if eq .builtin.machineDeployment.version "v1.30.0" -}}
ubuntu-2204-kube-v1.30.0
{{- else -}}
ubuntu-2204-kube-v1.31.0
ubuntu-2404-kube-v1.31.0
{{- end -}}
selector:
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
Expand Down