ROSA with HCP split integration

Author: EricPonvelle

.s2i/httpd-cfg/01-commercial.conf

@@ -386,11 +386,7 @@ AddType text/vtt                            vtt
 
     # Service Mesh landing page
 
-<<<<<<< HEAD
     RewriteRule ^container-platform/(4\.14|4\.15|4\.16|4\.17|4\.18)/service_mesh/v3x/ossm-service-mesh-3-0-overview.html /service-mesh/3.0.0tp1/about/ossm-about-openshift-service-mesh.html [NE,R=302]
-=======
-    RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/service-mesh/about/ossm-about-openshift-service-mesh.html /service-mesh/latest/about/ossm-about-openshift-service-mesh.html [NE,R=302]
->>>>>>> c17ffd7cec (Adding the Security HCP cherrypick)
 
     # Pipelines handling unversioned and latest links
     RewriteRule ^pipelines/?$ /pipelines/latest [R=302]

_attributes/common-attributes.adoc

@@ -40,11 +40,8 @@ endif::[]
 :oadp-full: OpenShift API for Data Protection
 :oadp-short: OADP
 :oadp-version: 1.4.1
-<<<<<<< HEAD
 :oadp-version-1-3: 1.3.3
 :oadp-version-1-4: 1.4.1
-=======
->>>>>>> c17ffd7cec (Adding the Security HCP cherrypick)
 :oc-first: pass:quotes[OpenShift CLI (`oc`)]
 :product-registry: OpenShift image registry
 :product-mirror-registry: Mirror registry for Red Hat OpenShift

_topic_maps/_topic_map.yml

@@ -135,22 +135,22 @@ Topics:
 - Name: Updating a cluster in a disconnected environment
   Dir: updating
   Topics:
-  - Name: About cluster updates in a disconnected environment
-    File: index
-  - Name: Mirroring OpenShift Container Platform images
-    File: mirroring-image-repository
-  - Name: Updating a cluster in a disconnected environment using OSUS
-    File: disconnected-update-osus
-    Distros: openshift-enterprise
-  - Name: Updating a cluster in a disconnected environment without OSUS
-    File: disconnected-update
-    Distros: openshift-enterprise
-  - Name: Updating a cluster in a disconnected environment by using the CLI
-    File: disconnected-update
-    Distros: openshift-origin
-  - Name: Uninstalling OSUS from a cluster
-    File: uninstalling-osus
-    Distros: openshift-enterprise
+    - Name: About cluster updates in a disconnected environment
+      File: index
+    - Name: Mirroring OpenShift Container Platform images
+      File: mirroring-image-repository
+    - Name: Updating a cluster in a disconnected environment using OSUS
+      File: disconnected-update-osus
+      Distros: openshift-enterprise
+    - Name: Updating a cluster in a disconnected environment without OSUS
+      File: disconnected-update
+      Distros: openshift-enterprise
+    - Name: Updating a cluster in a disconnected environment by using the CLI
+      File: disconnected-update
+      Distros: openshift-origin
+    - Name: Uninstalling OSUS from a cluster
+      File: uninstalling-osus
+      Distros: openshift-enterprise
 ---
 Name: Installing
 Dir: installing
@@ -2522,17 +2522,11 @@ Topics:
     File: hcp-destroy-virt
   - Name: Destroying a hosted cluster on IBM Z
     File: hcp-destroy-ibmz
-<<<<<<< HEAD
   - Name: Destroying a hosted cluster on IBM Power
     File: hcp-destroy-ibmpower
   - Name: Destroying a hosted cluster on non-bare metal agent machines
     File: hcp-destroy-non-bm
 - Name: Manually importing a hosted cluster
-=======
-  - Name: Destroying a hosted cluster on non-bare metal agent machines
-    File: hcp-destroy-non-bm
-- Name: Manually importing a hosted control plane cluster
->>>>>>> c17ffd7cec (Adding the Security HCP cherrypick)
   File: hcp-import
 ---
 Name: Nodes

_topic_maps/_topic_map_ms.yml

@@ -33,13 +33,8 @@ Name: Red Hat build of MicroShift release notes
 Dir: microshift_release_notes
 Distros: microshift
 Topics:
-<<<<<<< HEAD
 - Name: Red Hat build of MicroShift 4.18 release notes
   File: microshift-4-18-release-notes
-=======
-- Name: Red Hat build of MicroShift 4.17 release notes
-  File: microshift-4-17-release-notes
->>>>>>> c17ffd7cec (Adding the Security HCP cherrypick)
 ---
 Name: Getting ready to install MicroShift
 Dir: microshift_install_get_ready
@@ -115,11 +110,7 @@ Dir: microshift_configuring
 Distros: microshift
 Topics:
 - Name: Using the MicroShift configuration file
-<<<<<<< HEAD
   File: microshift-using-config-yaml
-=======
-  File: microshift-using-config-tools
->>>>>>> c17ffd7cec (Adding the Security HCP cherrypick)
 - Name: Configuring IPv6 networking
   File: microshift-nw-ipv6-config
 - Name: Cluster access with kubeconfig
@@ -130,11 +121,8 @@ Topics:
   File: microshift-greenboot-checking-status
 - Name: Configuring audit logging policies
   File: microshift-audit-logs-config
-<<<<<<< HEAD
 - Name: Disabling LVMS CSI provider and CSI snapshot
   File: microshift-disable-lvms-csi-provider-csi-snapshot
-=======
->>>>>>> c17ffd7cec (Adding the Security HCP cherrypick)
 - Name: Configuring low latency
   Dir: microshift_low_latency
   Topics:

_topic_maps/_topic_map_rosa.yml

@@ -903,6 +903,8 @@ Topics:
   File: configuring-registry-operator
 - Name: Accessing the registry
   File: accessing-the-registry
+# - Name: Exposing the registry
+#   File: securing-exposing-registry
 ---
 Name: Operators
 Dir: operators