Skip to content

Commit

Permalink
Add k8s v1.29.0 ova's
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrischdi
chrischdi committed Dec 19, 2023
1 parent b6c02a9 commit 458a6d9
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 16 deletions.
79 changes: 72 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,78 @@ ecosystem.
Note: These OVAs are not updated for security fixes and it is recommended to always use the latest patch version for the Kubernetes version you wish to run. For production-like environments, it is
highly recommended to build and use your own custom images.

| Kubernetes | Ubuntu 18.04 | Ubuntu 20.04 | Ubuntu 22.04 | Photon 3 | Flatcar Stable |
|:----------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
| v1.24.11 | [ova](https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-1804-kube-v1.24.11.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-1804-kube-v1.24.11.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-2004-kube-v1.24.11.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-2004-kube-v1.24.11.ova.sha256) | N/A | [ova](https://storage.googleapis.com/capv-templates/v1.24.11/photon-3-kube-v1.24.11.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.11/photon-3-kube-v1.24.11.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.24.11/flatcar-stable-3374.2.5-kube-v1.24.11.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.11/flatcar-stable-3374.2.5-kube-v1.24.11.ova.sha256) |
| v1.25.7 | [ova](https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-1804-kube-v1.25.7.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-1804-kube-v1.25.7.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-2004-kube-v1.25.7.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-2004-kube-v1.25.7.ova.sha256) | N/A | [ova](https://storage.googleapis.com/capv-templates/v1.25.7/photon-3-kube-v1.25.7.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.7/photon-3-kube-v1.25.7.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.25.7/flatcar-stable-3374.2.5-kube-v1.25.7.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.7/flatcar-stable-3374.2.5-kube-v1.25.7.ova.sha256) |
| v1.26.2 | [ova](https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-1804-kube-v1.26.2.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-1804-kube-v1.26.2.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-2004-kube-v1.26.2.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-2004-kube-v1.26.2.ova.sha256) | N/A | [ova](https://storage.googleapis.com/capv-templates/v1.26.2/photon-3-kube-v1.26.2.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.26.2/photon-3-kube-v1.26.2.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.26.2/flatcar-stable-3374.2.5-kube-v1.26.2.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.26.2/flatcar-stable-3374.2.5-kube-v1.26.2.ova.sha256) |
| v1.27.3 | [ova](https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-1804-kube-v1.27.3.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-1804-kube-v1.27.3.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2004-kube-v1.27.3.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2004-kube-v1.27.3.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2204-kube-v1.27.3.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2204-kube-v1.27.3.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.27.3/photon-3-kube-v1.27.3.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.27.3/photon-3-kube-v1.27.3.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.27.3/flatcar-stable-3510.2.4-kube-v1.27.3.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.27.3/flatcar-stable-3510.2.4-kube-v1.27.3.ova.sha256) |
| v1.28.0 | [ova](https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-1804-kube-v1.28.0.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-1804-kube-v1.28.0.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2004-kube-v1.28.0.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2004-kube-v1.28.0.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2204-kube-v1.28.0.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2204-kube-v1.28.0.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.28.0/photon-3-kube-v1.28.0.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.28.0/photon-3-kube-v1.28.0.ova.sha256) | [ova](https://storage.googleapis.com/capv-templates/v1.28.0/flatcar-stable-3510.2.6-kube-v1.28.0.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.28.0/flatcar-stable-3510.2.6-kube-v1.28.0.ova.sha256) |
<table>
<tr>
<th>Kubernetes</th>
<th>Ubuntu 18.04</th>
<th>Ubuntu 20.04</th>
<th>Ubuntu 22.04</th>
<th>Photon 3</th>
<th>Photon 5</th>
<th>Flatcar Stable</th>
</tr>

<tr>
<td>v1.24.11</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-1804-kube-v1.24.11.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-1804-kube-v1.24.11.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-2004-kube-v1.24.11.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.24.11/ubuntu-2004-kube-v1.24.11.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.24.11/photon-3-kube-v1.24.11.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.24.11/photon-3-kube-v1.24.11.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.24.11/flatcar-stable-3374.2.5-kube-v1.24.11.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.24.11/flatcar-stable-3374.2.5-kube-v1.24.11.ova.sha256">sha256</a></td>
</tr>

<tr>
<td>v1.25.7</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-1804-kube-v1.25.7.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-1804-kube-v1.25.7.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-2004-kube-v1.25.7.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.25.7/ubuntu-2004-kube-v1.25.7.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.25.7/photon-3-kube-v1.25.7.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.25.7/photon-3-kube-v1.25.7.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.25.7/flatcar-stable-3374.2.5-kube-v1.25.7.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.25.7/flatcar-stable-3374.2.5-kube-v1.25.7.ova.sha256">sha256</a></td>
</tr>

<tr>
<td>v1.26.2</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-1804-kube-v1.26.2.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-1804-kube-v1.26.2.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-2004-kube-v1.26.2.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-2004-kube-v1.26.2.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.26.2/photon-3-kube-v1.26.2.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.26.2/photon-3-kube-v1.26.2.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.26.2/flatcar-stable-3374.2.5-kube-v1.26.2.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.26.2/flatcar-stable-3374.2.5-kube-v1.26.2.ova.sha256">sha256</a></td>
</tr>

<tr>
<td>v1.27.3</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-1804-kube-v1.27.3.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-1804-kube-v1.27.3.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2004-kube-v1.27.3.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2004-kube-v1.27.3.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2204-kube-v1.27.3.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.27.3/ubuntu-2204-kube-v1.27.3.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.27.3/photon-3-kube-v1.27.3.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.27.3/photon-3-kube-v1.27.3.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.27.3/flatcar-stable-3510.2.4-kube-v1.27.3.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.27.3/flatcar-stable-3510.2.4-kube-v1.27.3.ova.sha256">sha256</a></td>
</tr>

<tr>
<td>v1.28.0</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-1804-kube-v1.28.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-1804-kube-v1.28.0.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2004-kube-v1.28.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2004-kube-v1.28.0.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2204-kube-v1.28.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.28.0/ubuntu-2204-kube-v1.28.0.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.28.0/photon-3-kube-v1.28.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.28.0/photon-3-kube-v1.28.0.ova.sha256">sha256</a></td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.28.0/flatcar-stable-3510.2.6-kube-v1.28.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.28.0/flatcar-stable-3510.2.6-kube-v1.28.0.ova.sha256">sha256</a></td>
</tr>

<tr>
<td>v1.29.0</td>
<td>N/A</td>
<td>N/A</td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.29.0/ubuntu-2204-kube-v1.29.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.29.0/ubuntu-2204-kube-v1.29.0.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.29.0/photon-3-kube-v1.29.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.29.0/photon-3-kube-v1.29.0.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.29.0/photon-5-kube-v1.29.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.29.0/photon-5-kube-v1.29.0.ova.sha256">sha256</a></td>
<td><a href="https://storage.googleapis.com/capv-templates/v1.29.0/flatcar-stable-3602.2.3-kube-v1.29.0.ova">ova</a>, <a href="https://storage.googleapis.com/capv-templates/v1.29.0/flatcar-stable-3602.2.3-kube-v1.29.0.ova.sha256">sha256</a></td>
</tr>

</table>

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

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/clusterctl_upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8=
InitWithRuntimeExtensionProviders: []string{},
// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
// This is to guarantee that both, the old and new CAPI version, support the defined version.
InitWithKubernetesVersion: "v1.28.0",
WorkloadKubernetesVersion: "v1.28.0",
InitWithKubernetesVersion: "v1.29.0",
WorkloadKubernetesVersion: "v1.29.0",
WorkloadFlavor: "workload",
}
})
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/config/vsphere-ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ providers:
- sourcePath: "../data/shared/v1.7/v1beta1_provider/metadata.yaml"

variables:
KUBERNETES_VERSION: "v1.28.0"
KUBERNETES_VERSION: "v1.29.0"
CPI_IMAGE_K8S_VERSION: "v1.28.0"
CNI: "./data/cni/calico/calico.yaml"
EXP_CLUSTER_RESOURCE_SET: "true"
Expand All @@ -194,8 +194,8 @@ variables:
VSPHERE_DATASTORE: "WorkloadDatastore"
VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
VSPHERE_NETWORK: "sddc-cgw-network-6"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.28.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3510.2.6-kube-v1.28.0"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3602.2.3-kube-v1.29.0"
VSPHERE_INSECURE_CSI: "true"
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
NODE_DRAIN_TIMEOUT: "60s"
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/config/vsphere-dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ providers:
- sourcePath: "../data/shared/v1.7/v1beta1_provider/metadata.yaml"

variables:
KUBERNETES_VERSION: "v1.28.0"
KUBERNETES_VERSION: "v1.29.0"
CPI_IMAGE_K8S_VERSION: "v1.28.0"
CNI: "./data/cni/calico/calico.yaml"
EXP_CLUSTER_RESOURCE_SET: "true"
Expand All @@ -200,8 +200,8 @@ variables:
VSPHERE_DATASTORE: "WorkloadDatastore"
VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
VSPHERE_NETWORK: "network-1"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.28.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3510.2.6-kube-v1.28.0"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3602.2.3-kube-v1.29.0"
# WORKLOAD_CONTROL_PLANE_ENDPOINT_IP:
# Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
# VSPHERE_SSH_AUTHORIZED_KEY:
Expand All @@ -223,7 +223,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.28.0"
VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
# Dedicated IP to be used by kube-vip
VSPHERE2_CONTROL_PLANE_ENDPOINT_IP:
# Following variables are also required and please use env variables to avoid disclosure of sensitive data
Expand Down

0 comments on commit 458a6d9

Please sign in to comment.