Merge pull request #33524 from bergerhoffer/build-issue-fixes

Fixing some of the build issues on master

Author: bergerhoffer

migrating_from_ocp_3_to_4/planning-migration-3-4.adoc

@@ -69,38 +69,38 @@ In {product-title} 3.11, you upgraded your cluster by running Ansible playbooks.
 For more information, see xref:../updating/updating-cluster-between-minor.adoc#updating-cluster-between-minor[Updating clusters].
 
 [id="migration-considerations"]
-= Migration considerations
+== Migration considerations
 
 Review the changes and other considerations that might affect your transition from {product-title} 3.11 to {product-title} 4.
 
 [id="migration-preparing-storage"]
-== Storage considerations
+=== Storage considerations
 
 Review the following storage changes to consider when transitioning from {product-title} 3.11 to {product-title} {product-version}.
 
 [discrete]
-=== Local volume persistent storage
+==== Local volume persistent storage
 
 Local storage is only supported by using the Local Storage Operator in {product-title} {product-version}. It is not supported to use the local provisioner method from {product-title} 3.11.
 
 For more information, see xref:../storage/persistent_storage/persistent-storage-local.adoc#persistent-storage-using-local-volume[Persistent storage using local volumes].
 
 [discrete]
-=== FlexVolume persistent storage
+==== FlexVolume persistent storage
 
 The FlexVolume plug-in location changed from {product-title} 3.11. The new location in {product-title} {product-version} is `/etc/kubernetes/kubelet-plugins/volume/exec`. Attachable FlexVolume plug-ins are no longer supported.
 
 For more information, see xref:../storage/persistent_storage/persistent-storage-flexvolume.adoc#persistent-storage-using-flexvolume[Persistent storage using FlexVolume].
 
 [discrete]
-=== Container Storage Interface (CSI) persistent storage
+==== Container Storage Interface (CSI) persistent storage
 
 Persistent storage using the Container Storage Interface (CSI) was link:https://access.redhat.com/support/offerings/techpreview[Technology Preview] in {product-title} 3.11. {product-title} {product-version} fully supports CSI version 1.1.0 and ships with xref:../storage/container_storage_interface/persistent-storage-csi.adoc#csi-drivers-supported_persistent-storage-csi[several CSI drivers]. You can also install your own driver.
 
 For more information, see xref:../storage/container_storage_interface/persistent-storage-csi.adoc#persistent-storage-using-csi[Persistent storage using the Container Storage Interface (CSI)].
 
 [discrete]
-=== Red Hat OpenShift Container Storage
+==== Red Hat OpenShift Container Storage
 
 Red Hat OpenShift Container Storage 3, which is available for use with {product-title} 3.11, uses Red Hat Gluster Storage as the backing storage.
 
@@ -109,7 +109,7 @@ Red Hat OpenShift Container Storage 4, which is available for use with {product-
 For more information, see xref:../storage/persistent_storage/persistent-storage-ocs.adoc#red-hat-openshift-container-storage[Persistent storage using Red Hat OpenShift Container Storage] and the link:https://access.redhat.com/articles/4731161[interoperability matrix] article.
 
 [discrete]
-=== Unsupported persistent storage options
+==== Unsupported persistent storage options
 
 Support for the following persistent storage options from {product-title} 3.11 has changed in {product-title} {product-version}:
 
@@ -122,12 +122,12 @@ If you used one of these in {product-title} 3.11, you must choose a different pe
 For more information, see xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage].
 
 [id="migration-preparing-networking"]
-== Networking considerations
+=== Networking considerations
 
 Review the following networking changes to consider when transitioning from {product-title} 3.11 to {product-title} {product-version}.
 
 [discrete]
-=== Network isolation mode
+==== Network isolation mode
 
 The default network isolation mode for {product-title} 3.11 was `ovs-subnet`, though users frequently switched to use `ovn-multitenant`. The default network isolation mode for {product-title} {product-version} is controlled by a network policy.
 
@@ -136,45 +136,45 @@ If your {product-title} 3.11 cluster used the `ovs-subnet` or `ovs-multitenant`
 For more information, see xref:../networking/network_policy/about-network-policy.adoc#about-network-policy[About network policy].
 
 [id="migration-preparing-logging"]
-== Logging considerations
+=== Logging considerations
 
 Review the following logging changes to consider when transitioning from {product-title} 3.11 to {product-title} {product-version}.
 
 [discrete]
-=== Deploying OpenShift Logging
+==== Deploying OpenShift Logging
 
 {product-title} 4 provides a simple deployment mechanism for OpenShift Logging, by using a Cluster Logging custom resource.
 
 For more information, see xref:../logging/cluster-logging-deploying.adoc#cluster-logging-deploying_cluster-logging-deploying[Installing OpenShift Logging].
 
 [discrete]
-=== Aggregated logging data
+==== Aggregated logging data
 
 You cannot transition your aggregate logging data from {product-title} 3.11 into your new {product-title} 4 cluster.
 
 For more information, see xref:../logging/cluster-logging.adoc#cluster-logging-about_cluster-logging[About OpenShift Logging].
 
 [discrete]
-=== Unsupported logging configurations
+==== Unsupported logging configurations
 
 Some logging configurations that were available in {product-title} 3.11 are no longer supported in {product-title} {product-version}.
 
 For more information on the explicitly unsupported logging cases, see xref:../logging/config/cluster-logging-maintenance-support.adoc#cluster-logging-maintenance-and-support[Maintenance and support].
 
 [id="migration-preparing-security"]
-== Security considerations
+=== Security considerations
 
 Review the following security changes to consider when transitioning from {product-title} 3.11 to {product-title} {product-version}.
 
 [discrete]
-=== Unauthenticated access to discovery endpoints
+==== Unauthenticated access to discovery endpoints
 
 In {product-title} 3.11, an unauthenticated user could access the discovery endpoints (for example, [x-]`/api/*` and [x-]`/apis/*`). For security reasons, unauthenticated access to the discovery endpoints is no longer allowed in {product-title} {product-version}. If you do need to allow unauthenticated access, you can configure the RBAC settings as necessary; however, be sure to consider the security implications as this can expose internal cluster components to the external network.
 
 // TODO: Anything to xref to, or additional details?
 
 [discrete]
-=== Identity providers
+==== Identity providers
 
 Configuration for identity providers has changed for {product-title} 4, including the following notable changes:
 
@@ -184,17 +184,17 @@ Configuration for identity providers has changed for {product-title} 4, includin
 For more information, see xref:../authentication/understanding-identity-provider.adoc#understanding-identity-provider[Understanding identity provider configuration].
 
 [discrete]
-=== OAuth token storage format
+==== OAuth token storage format
 
 Newly created OAuth HTTP bearer tokens no longer match the names of their OAuth access token objects. The object names are now a hash of the bearer token and are no longer sensitive. This reduces the risk of leaking sensitive information.
 
 [id="migration-preparing-monitoring"]
-== Monitoring considerations
+=== Monitoring considerations
 
 Review the following monitoring changes to consider when transitioning from {product-title} 3.11 to {product-title} {product-version}.
 
 [discrete]
-=== Alert for monitoring infrastructure availability
+==== Alert for monitoring infrastructure availability
 
 The default alert that triggers to ensure the availability of the monitoring structure was called `DeadMansSwitch` in {product-title} 3.11. This was renamed to `Watchdog` in {product-title} 4. If you had PagerDuty integration set up with this alert in {product-title} 3.11, you must set up the PagerDuty integration for the `Watchdog` alert in {product-title} 4.
 

modules/ossm-config-sidecar-mtls.adoc

@@ -3,13 +3,13 @@
 // * service_mesh/v2x/ossm-config.adoc
 
 [id="ossm-security-mtls-sidecars-incoming-services_{context}"]
-=== Configuring sidecars for incoming connections for specific services
+= Configuring sidecars for incoming connections for specific services
 
-You can also configure mTLS for individual services by creating a policy. 
+You can also configure mTLS for individual services by creating a policy.
 
 .Procedure
 
-. Create a YAML file using the following example. 
+. Create a YAML file using the following example.
 +
 .PeerAuthentication Policy example policy.yaml
 [source,yaml]
@@ -24,7 +24,7 @@ spec:
     mode: STRICT
 ----
 +
-.. Replace `<namespace>` with the namespace where the service is located. 
+.. Replace `<namespace>` with the namespace where the service is located.
 
 . Run the following command to create the resource in the namespace where the service is located. It must match the `namespace` field in the Policy resource you just created.
 +

modules/ossm-routing-bookinfo-applying.adoc

@@ -1,18 +1,18 @@
 [id="ossm-routing-bookinfo-applying_{context}"]
-== Applying a virtual service
+= Applying a virtual service
 
-In the following procedure, the virtual service routes all traffic to `v1` of each micro-service by applying virtual services that set the default version for the micro-services. 
+In the following procedure, the virtual service routes all traffic to `v1` of each micro-service by applying virtual services that set the default version for the micro-services.
 
 .Procedure
 
-1.  Apply the virtual services.
+. Apply the virtual services.
 +
 [source,bash,subs="attributes"]
 ----
 $ oc apply -f https://raw.githubusercontent.com/Maistra/istio/maistra-{MaistraVersion}/samples/bookinfo/networking/virtual-service-all-v1.yaml
 ----
-+
-2. To verify that you applied the virtual services, display the defined routes with the following command:
+
+. To verify that you applied the virtual services, display the defined routes with the following command:
 +
 [source,terminal]
 ----

modules/ossm-routing-bookinfo-route.adoc

@@ -1,5 +1,5 @@
 [id="ossm-routing-bookinfo-route_{context}"]
-== Route based on user identity
+= Route based on user identity
 
 Change the route configuration so that all traffic from a specific user is routed to a specific service version. In this case, all traffic from a user named `jason` will be routed to the service `reviews:v2`.
 
@@ -21,7 +21,7 @@ $ oc apply -f https://raw.githubusercontent.com/Maistra/istio/maistra-{MaistraVe
 $ oc get virtualservice reviews -o yaml
 ----
 
-. On the `/productpage` of the Bookinfo app, log in as user `jason` with no password. 
+. On the `/productpage` of the Bookinfo app, log in as user `jason` with no password.
 +
 .. Refresh the browser. The star ratings appear next to each review.
 

modules/ossm-routing-bookinfo-test.adoc

@@ -1,5 +1,5 @@
 [id="ossm-routing-bookinfo-test_{context}"]
-== Testing the new route configuration
+= Testing the new route configuration
 
 Test the new configuration by refreshing the `/productpage` of the Bookinfo application.
 

service_mesh/v2x/ossm-create-smcp.adoc

@@ -5,12 +5,12 @@ include::modules/ossm-document-attributes.adoc[]
 
 You can deploy a basic installation of the `ServiceMeshControlPlane` by using either the {product-title} web console or from the command line using the `oc` client tool.
 
-include::modules/ossm-control-plane-web.adoc[leveloffset=+2]
+include::modules/ossm-control-plane-web.adoc[leveloffset=+1]
 
-include::modules/ossm-control-plane-cli.adoc[leveloffset=+2]
+include::modules/ossm-control-plane-cli.adoc[leveloffset=+1]
 
 {ProductName} supports multiple independent control planes within the cluster.  You can create reusable configurations with `ServiceMeshControlPlane` profiles. For more information, see xref:../../service_mesh/v2x/ossm-profiles-users.adoc#ossm-control-plane-profiles_ossm-profiles-users[Creating control plane profiles].
 
 == Next steps
 
-Create a `ServiceMeshMemberRoll` resource to specify the namespaces associated with the {ProductShortName}. For more information, see xref:../../service_mesh/v2x/ossm-create-mesh.adoc#ossm-create-mesh[Adding services to a service mesh].
+Create a `ServiceMeshMemberRoll` resource to specify the namespaces associated with the {ProductShortName}. For more information, see xref:../../service_mesh/v2x/ossm-create-mesh.adoc#ossm-create-mesh[Adding services to a service mesh].

service_mesh/v2x/ossm-security.adoc

@@ -18,7 +18,7 @@ include::modules/ossm-security-mtls.adoc[leveloffset=+1]
 
 include::modules/ossm-config-sec-mtls-mesh.adoc[leveloffset=+2]
 
-include::modules/ossm-config-sidecar-mtls.adoc[leveloffset=+2]
+include::modules/ossm-config-sidecar-mtls.adoc[leveloffset=+3]
 
 include::modules/ossm-config-sidecar-out-mtls.adoc[leveloffset=+2]