Skip to content

Commit 1f1d186

Browse files
authored
Merge pull request #86162 from openshift-cherrypick-robot/cherry-pick-83951-to-enterprise-4.16
[enterprise-4.16] OSDOCS-7651: Removing MCO info (4.16+)
2 parents 6d8ec8e + 74ec42f commit 1f1d186

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

architecture/control-plane.adoc

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,6 @@ include::modules/arch-olm-operators.adoc[leveloffset=+2]
5050
* For more details on running add-on Operators in {product-title}, see the _Operators_ guide sections on xref:../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[Operator Lifecycle Manager (OLM)] and xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[OperatorHub].
5151
* For more details on the Operator SDK, see xref:../operators/operator_sdk/osdk-about.adoc#osdk-about[Developing Operators].
5252

53-
// This module does not apply to OSD/ROSA
54-
ifndef::openshift-dedicated,openshift-rosa[]
55-
include::modules/understanding-machine-config-operator.adoc[leveloffset=+1]
56-
endif::openshift-dedicated,openshift-rosa[]
57-
58-
// These additional resources do not apply to OSD/ROSA
59-
ifndef::openshift-dedicated,openshift-rosa[]
60-
[role="_additional-resources"]
61-
.Additional resources
62-
* For more information about detecting configuration drift, see xref:../machine_configuration/index.adoc#machine-config-drift-detection_machine-config-overview[Understanding configuration drift detection].
63-
64-
* For information about preventing the control plane machines from rebooting after the Machine Config Operator makes changes to the machine configuration, see xref:../support/troubleshooting/troubleshooting-operator-issues.adoc#troubleshooting-disabling-autoreboot-mco_troubleshooting-operator-issues[Disabling Machine Config Operator from automatically rebooting].
65-
66-
* xref:../machine_configuration/machine-config-node-disruption.adoc#machine-config-node-disruption[Understanding node restart behaviors after machine config changes]
67-
endif::openshift-dedicated,openshift-rosa[]
68-
6953
include::modules/etcd-overview.adoc[leveloffset=+1]
7054

7155
// These modules only apply to ROSA/OSD

modules/understanding-machine-config-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * architecture/control-plane.adoc
3+
// * machine_configuration/machine-config-index.adoc
44
:_mod-docs-content-type: CONCEPT
55
[id="about-machine-config-operator_{context}"]
66
= About the Machine Config Operator

0 commit comments

Comments
 (0)