Merge pull request #60928 from xenolinux/azure-user-defined-tags-ga

OSDOCS#6467: user-defined Azure tags are GA: Remove "featureSet: TechPreviewNoUpgrade"

Author: abhatt-rh

modules/installation-user-defined-tags-azure.adoc

@@ -7,7 +7,7 @@
 
 In {product-title}, you can use the tags for grouping resources and for managing resource access and cost. You can define the tags on the Azure resources in the `install-config.yaml` file only during {product-title} cluster creation. You cannot modify the user-defined tags after cluster creation.
 
-Support for user-defined tags is available only for the resources created in the Azure Public Cloud, and in {product-title} 4.13 as a Technology Preview (TP). User-defined tags are not supported for the {product-title} clusters upgraded to {product-title} 4.13.
+Support for user-defined tags is available only for the resources created in the Azure Public Cloud. User-defined tags are not supported for the {product-title} clusters upgraded to {product-title} 4.14.
 
 User-defined and {product-title} specific tags are applied only to the resources created by the {product-title} installer and its core operators such as Machine api provider azure Operator, Cluster Ingress Operator, Cluster Image Registry Operator.
 
@@ -21,51 +21,52 @@ You can use the `.platform.azure.userTags` field in the `install-config.yaml` fi
 additionalTrustBundlePolicy: Proxyonly <1>
 apiVersion: v1
 baseDomain: catchall.azure.devcluster.openshift.com <2>
-featureSet: TechPreviewNoUpgrade <3>
-compute: <4>
+compute: <3>
 - architecture: amd64
-  hyperthreading: Enabled <5>
+  hyperthreading: Enabled <4>
   name: worker
   platform: {}
   replicas: 3
-controlPlane:  <4> <6>
+controlPlane: <5>
   architecture: amd64
-  hyperthreading: Enabled <5>
+  hyperthreading: Enabled <6>
   name: master
   platform: {}
   replicas: 3
 metadata:
   creationTimestamp: null
-  name: user <2>
+  name: user <7>
 networking:
   clusterNetwork:
   - cidr: 10.128.0.0/14
     hostPrefix: 23
   machineNetwork:
   - cidr: 10.0.0.0/16
-  networkType: OVNKubernetes <7>
+  networkType: OVNKubernetes <8>
   serviceNetwork:
   - 172.30.0.0/16
 platform:
   azure:
-    baseDomainResourceGroupName: os4-common <8>
-    cloudName: AzurePublicCloud <9>
+    baseDomainResourceGroupName: os4-common <9>
+    cloudName: AzurePublicCloud <10>
     outboundType: Loadbalancer
-    region: southindia <2>
-    userTags: <10>
+    region: southindia <11>
+    userTags: <12>
       createdBy: user
       environment: dev
 ----
 <1> Defines the trust bundle policy.
-<2> Required. The installation program prompts you for this value.
-<3> You must set the `featureSet` field as `TechPreviewNoUpgrade`.
-<4> If you do not provide these parameters and values, the installation program provides the default value.
-<5> To enable or disable simultaneous multithreading, or `hyperthreading`. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores. You can disable it by setting the parameter value to `Disabled`. If you disable simultaneous multithreading in some cluster machines, you must disable it in all cluster machines.
-<6> The `controlPlane` section is a single mapping, but the `compute` section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`, and the first line of the `controlPlane` section must not. Only one control plane pool is used.
-<7> The cluster network plugin to install. The supported values are `OVNKubernetes` and `OpenShiftSDN`. The default value is `OVNKubernetes`.
-<8> Specifies the resource group for the base domain of the Azure DNS zone.
-<9> Specifies the name of the Azure cloud environment. You can use the `cloudName` field to configure the Azure SDK with the Azure API endpoints. If you do not provide value, the default value is Azure Public Cloud.
-<10> Defines the additional keys and values that the installer adds as tags to all Azure resources that it creates.
+<2> Required. The `baseDomain` parameter specifies the base domain of your cloud provider. The installation program prompts you for this value.
+<3> The configuration for the machines that comprise compute. The `compute` section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`. If you do not provide these parameters and values, the installation program provides the default value.
+<4> To enable or disable simultaneous multithreading, or `hyperthreading`. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores. You can disable it by setting the parameter value to `Disabled`. If you disable simultaneous multithreading in some cluster machines, you must disable it in all cluster machines.
+<5> The configuration for the machines that comprise the control plane. The `controlPlane` section is a single mapping. The first line of the `controlPlane` section must not begin with a hyphen, `-`. You can use only one control plane pool. If you do not provide these parameters and values, the installation program provides the default value.
+<6> To enable or disable simultaneous multithreading, or `hyperthreading`. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores. You can disable it by setting the parameter value to `Disabled`. If you disable simultaneous multithreading in some cluster machines, you must disable it in all cluster machines.
+<7> The installation program prompts you for this value.
+<8> The cluster network plugin to install. The supported values are `OVNKubernetes` and `OpenShiftSDN`. The default value is `OVNKubernetes`.
+<9> Specifies the resource group for the base domain of the Azure DNS zone.
+<10> Specifies the name of the Azure cloud environment. You can use the `cloudName` field to configure the Azure SDK with the Azure API endpoints. If you do not provide value, the default value is Azure Public Cloud.
+<11> Required. Specifies the name of the Azure region that hosts your cluster. The installation program prompts you for this value.
+<12> Defines the additional keys and values that the installation program adds as tags to all Azure resources that it creates.
 
 The user-defined tags have the following limitations: