Skip to content

Commit 25d3261

Browse files
authored
Merge pull request #49167 from rh-tokeefe/OSSMDOC-638
OSSMDOC-638: IOR should copy labels from Gateway to Route
2 parents 488842e + ff51c40 commit 25d3261

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

modules/ossm-auto-route-annotations.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
//
44

55
[id="ossm-auto-route-annotations_{context}"]
6-
= {SMProductName} route annotations
6+
= {SMProductName} route labels and annotations
77

8-
Sometimes specific annotations are needed in an OpenShift Route.
8+
Sometimes specific labels or annotations are needed in an OpenShift Route.
99
ifdef::openshift-enterprise[]
10-
For example, some advanced features in OpenShift Routes are managed via xref:../../networking/routes/route-configuration.adoc[special annotations].
10+
For example, some advanced features in OpenShift Routes are managed using special annotations. See "Route-specific annotations" in the following "Additional resources" section.
1111
endif::[]
1212

13-
For this and other use cases, {SMProductName} will copy all annotations present in the Istio Gateway resource (with the exception of those starting with `kubectl.kubernetes.io`) into the managed OpenShift Route resource.
13+
For this and other use cases, {SMProductName} will copy all labels and annotations present in the Istio Gateway resource (with the exception of annotations starting with `kubectl.kubernetes.io`) into the managed OpenShift Route resource.
1414

15-
If you need specific annotations in the OpenShift Routes created by {SMProductShortName}, create them in the Istio Gateway resource and they will be copied into the OpenShift Route resources managed by the {SMProductShortName}.
15+
If you need specific labels or annotations in the OpenShift Routes created by {SMProductShortName}, create them in the Istio Gateway resource and they will be copied into the OpenShift Route resources managed by the {SMProductShortName}.

service_mesh/v2x/ossm-traffic-manage.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ include::modules/ossm-auto-route.adoc[leveloffset=+2]
4242

4343
include::modules/ossm-auto-route-annotations.adoc[leveloffset=+2]
4444

45+
ifdef::openshift-enterprise[]
46+
.Additional resources
47+
* xref:../../networking/routes/route-configuration.adoc#nw-route-specific-annotations_route-configuration[Route-specific annotations].
48+
endif::[]
49+
4550
include::modules/ossm-auto-route-enable.adoc[leveloffset=+2]
4651

4752
include::modules/ossm-routing-sc.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)