Skip to content

Commit a6419e6

Browse files
authored
Merge pull request #96960 from openshift-cherrypick-robot/cherry-pick-96711-to-enterprise-4.19
[enterprise-4.19] OSDOCS-15521: Remove unnecessary headings and fix ID for Operator ref doc
2 parents bf5c907 + e6da5df commit a6419e6

File tree

52 files changed

+66
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+66
-190
lines changed

_unused_topics/windows-machine-config-operator.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
[id="windows-machine-config-operator_{context}"]
66
= Windows Machine Config Operator
77

8-
[discrete]
9-
== Purpose
10-
118
The Windows Machine Config Operator (WMCO) orchestrates the process of deploying and managing Windows workloads on a cluster. The WMCO configures Windows machines into compute nodes, enabling Windows container workloads to run in {product-title} clusters. This is done by creating a compute machine set that uses a Windows image with the Docker-formatted container runtime installed. The WMCO completes all necessary steps to configure the underlying Windows VM so that it can join the cluster as a compute node.
129

1310
[discrete]
1411
== Project
1512

16-
link:https://github.com/openshift/windows-machine-config-operator[windows-machine-config-operator]
13+
link:https://github.com/openshift/windows-machine-config-operator[windows-machine-config-operator]

architecture/control-plane.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ include::modules/arch-cluster-operators.adoc[leveloffset=+2]
4747
4848
[role="_additional-resources"]
4949
.Additional resources
50-
* xref:../operators/operator-reference.adoc#cluster-operators-ref[Cluster Operators reference]
50+
* xref:../operators/operator-reference.adoc#operator-reference[Cluster Operators reference]
5151
endif::[]
5252
5353
include::modules/arch-olm-operators.adoc[leveloffset=+2]

authentication/managing_cloud_provider_credentials/about-cloud-credential-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ To resolve insufficient credentials issues, provide a credential with sufficient
112112
[id="additional-resources_about-cloud-credential-operator_{context}"]
113113
== Additional resources
114114

115-
* xref:../../operators/operator-reference.adoc#cloud-credential-operator_cluster-operators-ref[Cluster Operators reference page for the Cloud Credential Operator]
115+
* xref:../../operators/operator-reference.adoc#cloud-credential-operator_operator-reference[Cluster Operators reference page for the Cloud Credential Operator]

edge_computing/day_2_core_cnf_clusters/troubleshooting/telco-troubleshooting-mco.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The same machine config is applied on all nodes or only on one MCP in the cluste
1414

1515
For more information about how and why to apply MCPs in a telco core cluster, see xref:../../../edge_computing/day_2_core_cnf_clusters/updating/telco-update-ocp-update-prep.adoc#telco-update-applying-mcp-labels-to-nodes-before-the-update_ocp-update-prep[Applying MachineConfigPool labels to nodes before the update].
1616

17-
For more information about the Machine Config Operator, see xref:../../../operators/operator-reference.adoc#machine-config-operator_cluster-operators-ref[Machine Config Operator].
17+
For more information about the Machine Config Operator, see xref:../../../operators/operator-reference.adoc#machine-config-operator_operator-reference[Machine Config Operator].
1818

1919
include::modules/telco-troubleshooting-mco-purpose.adoc[leveloffset=+1]
20-
include::modules/telco-troubleshooting-mco-apply-several-mcs.adoc[leveloffset=+1]
20+
include::modules/telco-troubleshooting-mco-apply-several-mcs.adoc[leveloffset=+1]

extensions/ce/update-paths.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ include::modules/olmv1-blocked-cluster-updates.adoc[leveloffset=+2]
6363
* xref:../../updating/understanding_updates/intro-to-updates.adoc#understanding_clusteroperator_conditiontypes_understanding-openshift-updates[Understanding cluster Operator condition types]
6464
* xref:../../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[Upgrading installed Operators]
6565
* xref:../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster]
66-
* xref:../../operators/operator-reference.adoc#cluster-operators-ref-olmv1_cluster-operators-ref[Cluster Operators reference -> {olmv1-first} Operator]
66+
* xref:../../operators/operator-reference.adoc#cluster-operators-ref-olmv1_operator-reference[Cluster Operators reference -> {olmv1-first} Operator]

hosted_control_planes/hcp-authentication-authorization.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ include::modules/osdk-cco-aws-sts-enabling.adoc[leveloffset=+1]
3333
[role="_additional-resources"]
3434
.Additional resources
3535

36-
* xref:../operators/operator-reference.adoc#cloud-credential-operator_cluster-operators-ref[Cluster Operators reference page for the Cloud Credential Operator]
36+
* xref:../operators/operator-reference.adoc#cloud-credential-operator_operator-reference[Cluster Operators reference page for the Cloud Credential Operator]

installing/overview/cluster-capabilities.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ include::modules/machine-api-capability.adoc[leveloffset=+2]
9292

9393
[role="_additional-resources"]
9494
.Additional resources
95-
* xref:../../machine_management/index.html#index[Overview of machine management]
96-
* xref:../../operators/operator-reference.html#machine-api-operator_cluster-operators-ref[Machine API Operator]
97-
* xref:../../operators/operator-reference.html#cluster-autoscaler-operator_cluster-operators-ref[Cluster Autoscaler Operator]
98-
* xref:../../operators/operator-reference.html#control-plane-machine-set-operator_cluster-operators-ref[Control Plane Machine Set Operator]
95+
* xref:../../machine_management/index.adoc#index[Overview of machine management]
96+
* xref:../../operators/operator-reference.adoc#machine-api-operator_operator-reference[Machine API Operator]
97+
* xref:../../operators/operator-reference.adoc#cluster-autoscaler-operator_operator-reference[Cluster Autoscaler Operator]
98+
* xref:../../operators/operator-reference.adoc#control-plane-machine-set-operator_operator-reference[Control Plane Machine Set Operator]
9999
100100
// Marketplace capability
101101
include::modules/operator-marketplace.adoc[leveloffset=+2]

machine_management/cluster_api_machine_management/cluster-api-about.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ include::modules/capi-arch-operator.adoc[leveloffset=+2]
3939

4040
[role="_additional-resources"]
4141
.Additional resources
42-
* xref:../../operators/operator-reference.adoc#cluster-capi-operator_cluster-operators-ref[{cluster-capi-operator}]
42+
* xref:../../operators/operator-reference.adoc#cluster-capi-operator_operator-reference[{cluster-capi-operator}]
4343

4444
//Cluster API primary resources
45-
include::modules/capi-arch-resources.adoc[leveloffset=+2]
45+
include::modules/capi-arch-resources.adoc[leveloffset=+2]

machine_management/control_plane_machine_management/cpmso-about.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ include::modules/cpmso-limitations.adoc[leveloffset=+2]
2525
[id="additional-resources_cpmso-about"]
2626
== Additional resources
2727

28-
* xref:../../operators/operator-reference.adoc#control-plane-machine-set-operator_cluster-operators-ref[Control Plane Machine Set Operator reference]
29-
* xref:../../rest_api/machine_apis/controlplanemachineset-machine-openshift-io-v1.adoc#controlplanemachineset-machine-openshift-io-v1[`ControlPlaneMachineSet` custom resource]
28+
* xref:../../operators/operator-reference.adoc#control-plane-machine-set-operator_operator-reference[Control Plane Machine Set Operator reference]
29+
* xref:../../rest_api/machine_apis/controlplanemachineset-machine-openshift-io-v1.adoc#controlplanemachineset-machine-openshift-io-v1[`ControlPlaneMachineSet` custom resource]

modules/cloud-credential-operator.adoc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * operators/operator-reference.adoc
44
// * installing/modules/node-tuning-operator.adoc
55

6-
ifeval::["{context}" == "cluster-operators-ref"]
6+
ifeval::["{context}" == "operator-reference"]
77
:operators:
88
endif::[]
99
ifeval::["{context}" == "cluster-capabilities"]
@@ -15,9 +15,6 @@ endif::[]
1515
ifdef::operators[= Cloud Credential Operator]
1616
ifdef::cluster-caps[= Cloud credential capability]
1717

18-
[discrete]
19-
== Purpose
20-
2118
ifdef::cluster-caps[]
2219
The Cloud Credential Operator provides features for the `CloudCredential` capability.
2320

@@ -51,9 +48,9 @@ link:https://github.com/openshift/cloud-credential-operator[openshift-cloud-cred
5148
No configuration required.
5249
endif::operators[]
5350

54-
ifeval::["{context}" == "cluster-operators-ref"]
51+
ifeval::["{context}" == "operator-reference"]
5552
:!operators:
5653
endif::[]
5754
ifeval::["{context}" == "cluster-capabilities"]
5855
:!cluster-caps:
59-
endif::[]
56+
endif::[]

0 commit comments

Comments
 (0)