Update docs to link to the OVAs in the community-owned GCS bucket (part

II)

Signed-off-by: Stefan Büringer [email protected]

README.md

@@ -136,13 +136,13 @@ Note: We recently moved the OVAs from a VMware-owned GCP project (https://storag
 A full list of the published machine images for CAPV may be obtained with the following command:
 
 ```shell
-gsutil ls gs://capv-templates/*
+gsutil ls "gs://artifacts.k8s-staging-capi-vsphere.appspot.com/templates/*"
 ```
 
 Or, to produce a list of URLs for the same image files (and their checksums), the following command may be used:
 
 ```shell
-gsutil ls gs://capv-templates/*/*.{ova,sha256} | sed 's~^gs://~https://storage.googleapis.com/~'
+gsutil ls "gs://artifacts.k8s-staging-capi-vsphere.appspot.com/templates/*" | grep -e ".ova" -e ".sha256" | sed 's~^gs://~https://storage.googleapis.com/~'
 ```
 
 ## Documentation

docs/getting_started.md

@@ -44,13 +44,12 @@ vCenter. Ensure you have credentials to your vCenter server (user, password and
 It is required that machines provisioned by CAPV have cloudinit or Ignition, kubeadm and a container runtime pre-installed. You can
 use one of the CAPV machine images generated by SIG Cluster Lifecycle as a VM template.
 
-The machine images are retrievable from public URLs. CAPV currently supports machine images based on Ubuntu 18.04 and
-CentOS 7. A list of published machine images is available [here][ovas]. For this guide we'll be deploying Kubernetes
-v1.17.3 on Ubuntu 18.04 (link to [machine image][default-machine-image]).
+The machine images are retrievable from public URLs. A list of published machine images is available [here][ovas].
+For this guide we'll be deploying Kubernetes v1.17.3 on Ubuntu 18.04.
 
 If you want to build your own image, take a look at the [image-builder][image-builder] project.
 
-[Deploy a VM from an OVA][vm-template] using the [OVA URL][default-machine-image].
+[Deploy a VM from an OVA][vm-template].
 
 **NOTE:** The rest of the guide will assume you named the VM `ubuntu-1804-kube-v1.17.3`.
 
@@ -215,6 +214,5 @@ $ clusterctl generate custom-cluster vsphere-quickstart \
 [docker]: https://docs.docker.com/glossary/?term=install
 [kubectl]: https://kubernetes.io/docs/tasks/tools/install-kubectl/
 [ovas]: ../README.md#kubernetes-versions-with-published-ovas
-[default-machine-image]: https://storage.googleapis.com/capv-images/release/v1.17.3/ubuntu-1804-kube-v1.17.3.ova
 [image-builder]: https://github.com/kubernetes-sigs/image-builder
 [govc]: https://github.com/vmware/govmomi/tree/master/govc

docs/ignition.md

@@ -180,4 +180,4 @@ kind delete cluster
 [4]: https://cluster-api.sigs.k8s.io/user/quick-start.html#install-clusterctl
 [5]: https://image-builder.sigs.k8s.io/capi/providers/vsphere.html
 [6]: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-17BEDA21-43F6-41F4-8FB2-E01D275FE9B4.html
-[7]: https://storage.googleapis.com/capv-templates/v1.25.6/flatcar-stable-3374.2.4-kube-v1.25.6.ova
+[7]: ../README.md#kubernetes-versions-with-published-ovas

docs/node-ipam-demo.md

@@ -168,7 +168,7 @@ export CONTROL_PLANE_ENDPOINT_IP="1.2.3.4"
 The CAPV README.md file includes links to ovas.
 
 ```bash
-govc import.ova https://storage.googleapis.com/capv-templates/v1.26.2/ubuntu-2004-kube-v1.26.2.ova
+govc import.ova https://storage.googleapis.com/artifacts.k8s-staging-capi-vsphere.appspot.com/templates/v1.26.2/ubuntu-2004-kube-v1.26.2.ova
 govc vm.markastemplate ubuntu-2004-kube-v1.26.2
 ```