Skip to content

Commit f50f2ac

Browse files
authored
Merge pull request #57594 from EricPonvelle/OSDOCS-5592_RemoveAzureRef
OSDOCS-5592: Removed references to Azure and GCP
2 parents 186bb07 + 013df49 commit f50f2ac

6 files changed

+22
-1
lines changed

logging/cluster-logging-external.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ include::modules/cluster-logging-troubleshooting-loki-entry-out-of-order-errors.
178178

179179
* link:https://grafana.com/docs/loki/latest/configuration/[Configuring Loki server]
180180

181+
ifndef::openshift-dedicated,openshift-rosa[]
181182
include::modules/cluster-logging-collector-log-forward-gcp.adoc[leveloffset=+1]
183+
endif::openshift-dedicated,openshift-rosa[]
182184

183185
include::modules/logging-forward-splunk.adoc[leveloffset=+1]
184186

modules/osd-applications-config-custom-domains.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ NAME ENDPOINT D
8484
<company_name> xxrywp.<company_name>.cluster-01.opln.s1.openshiftapps.com *.apps.<company_name>.io Ready
8585
----
8686

87-
. Using the endpoint value, add a new wildcard CNAME recordset to your managed DNS provider, such as Route53, Azure DNS, or Google DNS.
87+
. Using the endpoint value, add a new wildcard CNAME recordset to your managed DNS provider, such as Route53.
8888
+
8989
.Example
9090
+

modules/ossm-federation-across-cluster.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ service.beta.kubernetes.io/aws-load-balancer-type: nlb
2727

2828
The Fully Qualified Domain Name found in the `.status.loadBalancer.ingress.hostname` field of the ingress gateway `Service` object should be specified as one of the entries in the `.spec.remote.addresses` field of the `ServiceMeshPeer` object.
2929

30+
ifndef::openshift-rosa,openshift-dedicated[]
3031
== Exposing the federation ingress on Azure
3132
On Microsoft Azure, merely setting the service type to `LoadBalancer` suffices for mesh federation to operate correctly.
3233

@@ -36,3 +37,4 @@ The IP address found in the `.status.loadBalancer.ingress.ip` field of the ingre
3637
On Google Cloud Platform, merely setting the service type to `LoadBalancer` suffices for mesh federation to operate correctly.
3738

3839
The IP address found in the `.status.loadBalancer.ingress.ip` field of the ingress gateway `Service` object should be specified as one of the entries in the `.spec.remote.addresses` field of the `ServiceMeshPeer` object.
40+
endif::openshift-rosa,openshift-dedicated[]

modules/ossm-rn-new-features.adoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,12 @@ New Custom Resource Definitions (CRDs) have been added to support federating ser
606606

607607
* `ImportedServiceSet` - Defines which services for a given `ServiceMeshPeer` are imported from the peer mesh. These services must also be made available by the peer’s `ExportedServiceMeshSet` resource.
608608

609+
ifndef::openshift-dedicated,openshift-rosa[]
609610
Service Mesh Federation is not supported between clusters on Red Hat OpenShift Service on AWS (ROSA), Azure Red Hat OpenShift (ARO), or OpenShift Dedicated (OSD).
611+
endif::openshift-dedicated,openshift-rosa[]
612+
ifdef::openshift-dedicated,openshift-rosa[]
613+
Service Mesh Federation is not supported between clusters on Red Hat OpenShift Service on AWS (ROSA) or OpenShift Dedicated (OSD).
614+
endif::openshift-dedicated,openshift-rosa[]
610615

611616
=== OVN-Kubernetes Container Network Interface (CNI) generally available
612617

@@ -824,9 +829,17 @@ spec:
824829

825830
This release of {SMProductName} addresses Common Vulnerabilities and Exposures (CVEs) and bug fixes.
826831

832+
ifndef::openshift-dedicated,openshift-rosa[]
827833
== {SMProductName} on {product-dedicated} and Microsoft Azure Red Hat OpenShift
828834

829835
{SMProductName} is now supported through {product-dedicated} and Microsoft Azure Red Hat OpenShift.
836+
endif::openshift-dedicated,openshift-rosa[]
837+
ifdef::openshift-dedicated,openshift-rosa[]
838+
== {SMProductName} on {product-dedicated}
839+
840+
{SMProductName} is now supported through {product-dedicated}.
841+
endif::openshift-dedicated,openshift-rosa[]
842+
830843

831844
== New features {SMProductName} 2.0.6
832845

modules/ossm-supported-configurations.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ The {SMProductName} Operator supports multiple versions of the `ServiceMeshContr
1717

1818
* Red Hat {product-title} version 4.9 or later.
1919
* {product-dedicated} version 4.
20+
ifndef::openshift-dedicated,openshift-rosa[]
2021
* Azure Red Hat OpenShift (ARO) version 4.
22+
endif::openshift-dedicated,openshift-rosa[]
2123
* Red Hat OpenShift Service on AWS (ROSA).
2224

2325
[id="ossm-unsupported-configurations_{context}"]

networking/routes/secured-routes.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ toc::[]
99

1010
Secure routes provide the ability to use several types of TLS termination to serve certificates to the client. The following sections describe how to create re-encrypt, edge, and passthrough routes with custom certificates.
1111

12+
ifndef::openshift-dedicated,openshift-rosa[]
1213
[IMPORTANT]
1314
====
1415
If you create routes in Microsoft Azure through public endpoints, the resource
@@ -17,6 +18,7 @@ terms. For a list of terms that Azure restricts, see
1718
link:https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-manager-reserved-resource-name[Resolve reserved resource name errors]
1819
in the Azure documentation.
1920
====
21+
endif::openshift-dedicated,openshift-rosa[]
2022

2123
include::modules/nw-ingress-creating-a-reencrypt-route-with-a-custom-certificate.adoc[leveloffset=+1]
2224

0 commit comments

Comments
 (0)