Improve instructions for OVA template tagging and OS image URIs (#8719)

Co-authored-by: Abhay Krishna Arunachalam <[email protected]>

docs/content/en/docs/osmgmt/artifacts.md

@@ -30,11 +30,11 @@ See descriptions of the [`osImageURL`]({{< relref "../getting-started/baremetal/
 ### Ubuntu or RHEL OS images for Bare Metal
 
 EKS Anywhere does not distribute Ubuntu or RHEL OS images.
-However, see [Building node images]({{< relref "#building-node-images">}}) for information on how to build EKS Anywhere images from those Linux distributions.  Note:  if you utilize your Admin Host to build images, you will need to review  the DHCP integration provided by Libvirtd and ensure it is disabled.  If the Libvirtd DHCP is enabled, the "boots container" will detect a port conflict and terminate.
+However, see [Building node images]({{< relref "#building-node-images">}}) for information on how to build EKS Anywhere images from those Linux distributions.  Note:  if you utilize your Admin Host to build images, you will need to review the DHCP integration provided by Libvirtd and ensure it is disabled.  If the Libvirtd DHCP is enabled, the "boots container" will detect a port conflict and terminate.
 
 ### Bottlerocket OS images for Bare Metal
 
-Bottlerocket vends its Baremetal variant Images using a secure distribution tool called `tuftool`. Please refer to [Download Bottlerocket node images]({{< relref "#download-bottlerocket-node-images">}}) to download Bottlerocket image. You can also get the download URIs for Bottlerocket Baremetal images from the bundle release by running the following commands:
+Bottlerocket vends its Baremetal variant Images using a secure distribution tool called `tuftool`. Please refer to [Download Bottlerocket node images]({{< relref "#download-bottlerocket-node-images">}}) for instructions on downloading Bottlerocket Baremetal images. You can also get the download URIs for EKS Anywhere-vended Bottlerocket Baremetal images from the bundle release by running the following commands:
 
 Using the latest EKS Anywhere version
 ```bash
@@ -49,8 +49,10 @@ EKSA_RELEASE_VERSION=<EKS-A version>
 ```
 
 ```bash
+KUBEVERSION=1.30 # Replace this with the Kubernetes version you wish to use
+
 BUNDLE_MANIFEST_URL=$(curl -sL https://anywhere-assets.eks.amazonaws.com/releases/eks-a/manifest.yaml | yq ".spec.releases[] | select(.version==\"$EKSA_RELEASE_VERSION\").bundleManifestUrl")
-curl -s $BUNDLE_MANIFEST_URL | yq ".spec.versionsBundles[].eksD.raw.bottlerocket.uri"
+curl -s $BUNDLE_MANIFEST_URL | yq ".spec.versionsBundles[] | select(.kubeVersion==\"$KUBEVERSION\").eksD.raw.bottlerocket.uri"
 ```
 
 ### HookOS (kernel and initial ramdisk) for Bare Metal
@@ -82,7 +84,7 @@ curl -s $BUNDLE_MANIFEST_URL | yq ".spec.versionsBundles[0].tinkerbell.tinkerbel
 
 ### Bottlerocket OVAs
 
-Bottlerocket vends its VMware variant OVAs using a secure distribution tool called `tuftool`. Please refer [Download Bottlerocket node images]({{< relref "#download-bottlerocket-node-images">}}) to download Bottlerocket OVA. You can also get the download URIs for Bottlerocket OVAs from the bundle release by running the following commands:
+Bottlerocket vends its VMware variant OVAs using a secure distribution tool called `tuftool`. Please refer to [Download Bottlerocket node images]({{< relref "#download-bottlerocket-node-images">}}) for instructions on downloading Bottlerocket OVAs. You can also get the download URIs for EKS Anywhere-vended Bottlerocket OVAs from the bundle release by running the following commands:
 
 Using the latest EKS Anywhere version
 ```bash
@@ -97,15 +99,21 @@ EKSA_RELEASE_VERSION=<EKS-A version>
 ```
 
 ```bash
+KUBEVERSION=1.30 # Replace this with the Kubernetes version you wish to use
+
 BUNDLE_MANIFEST_URL=$(curl -sL https://anywhere-assets.eks.amazonaws.com/releases/eks-a/manifest.yaml | yq ".spec.releases[] | select(.version==\"$EKSA_RELEASE_VERSION\").bundleManifestUrl")
-curl -s $BUNDLE_MANIFEST_URL | yq ".spec.versionsBundles[].eksD.ova.bottlerocket.uri"
+curl -s $BUNDLE_MANIFEST_URL | yq ".spec.versionsBundles[] | select(.kubeVersion==\"$KUBEVERSION\").eksD.ova.bottlerocket.uri"
 ```
 
-#### Bottlerocket Template Tags
+### Ubuntu or RHEL OVAs
+EKS Anywhere no longer distributes Ubuntu or RHEL OVAs for use with EKS Anywhere clusters.
+Building your own Ubuntu or RHEL-based OVAs as described in [Building node images]({{< relref "#building-node-images">}}) is the only supported way to get that functionality.
 
-There are two categories of tags to be attached to the Bottlerocket templates in vCenter.
+### OVA Template Tags
 
-**os:** This category represents the OS corresponding to this template. The value for this tag must be `os:bottlerocket`.
+There are two categories of tags to be attached to the OVA templates in vCenter.
+
+**os:** This category represents the OS corresponding to this template. The possible values for this tag are `os:bottlerocket`, `os:redhat` and `os:ubuntu`.
 
 **eksdRelease:** This category represents the EKS Distro release corresponding to this template. The value for this tag can be obtained programmatically as follows.
 
@@ -122,16 +130,12 @@ EKSA_RELEASE_VERSION=<EKS-A version>
 ```
 
 ```bash
-KUBEVERSION=1.27 # Replace this with the Kubernetes version you wish to use
+KUBEVERSION=1.30 # Replace this with the Kubernetes version you wish to use
 
 BUNDLE_MANIFEST_URL=$(curl -sL https://anywhere-assets.eks.amazonaws.com/releases/eks-a/manifest.yaml | yq ".spec.releases[] | select(.version==\"$EKSA_RELEASE_VERSION\").bundleManifestUrl")
 curl -sL $BUNDLE_MANIFEST_URL | yq ".spec.versionsBundles[] | select(.kubeVersion==\"$KUBEVERSION\").eksD.name"
 ```
 
-### Ubuntu OVAs
-EKS Anywhere no longer distributes Ubuntu OVAs for use with EKS Anywhere clusters.
-Building your own Ubuntu-based nodes as described in [Building node images]({{< relref "#building-node-images">}}) is the only supported way to get that functionality.
-
 ## Download Bottlerocket node images
 Bottlerocket vends its VMware variant OVAs and Baremetal variants images using a secure distribution tool called `tuftool`. Please follow instructions down below to
 download Bottlerocket node images.