Skip to content

Commit 9251f94

Browse files
committed
Implemented IanM's comments
1 parent d068fe3 commit 9251f94

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

modules/ztp-removing-content-from-managed-clusters.adoc

+11-17
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,20 @@ metadata:
4343
spec:
4444
configDaemonNodeSelector:
4545
"node-role.kubernetes.io/$mcp": ""
46-
disableDrain: false <1>
46+
disableDrain: true <1>
4747
enableInjector: true
4848
enableOperatorWebhook: true
4949
----
50-
<1> Remove the `disableDrain: false` line.
50+
<1> Remove the `disableDrain: true` line.
5151

52-
. Change the `complianceType` of the affected policies to `mustonlyhave` in the `common-ranGen.yaml` file.
52+
. Change the `complianceType` of the affected policies to `mustonlyhave` in the `group-du-sno-ranGen.yaml` file.
5353
+
5454
.Example YAML
5555
[source,yaml]
5656
----
57-
- fileName: SriovSubscriptionNS.yaml
58-
policyName: "subscriptions-policy"
59-
complianceType: mustonlyhave
60-
- fileName: SriovSubscriptionOperGroup.yaml
61-
policyName: "subscriptions-policy"
62-
complianceType: mustonlyhave
63-
- fileName: SriovSubscription.yaml
64-
policyName: "subscriptions-policy"
65-
complianceType: mustonlyhave
57+
- fileName: SriovOperatorConfig.yaml
58+
policyName: "config-policy"
59+
complianceType: mustonlyhave
6660
----
6761
6862
. Create a `ClusterGroupUpdates` CR and specify the clusters you want to deploy the changes to:
@@ -77,7 +71,7 @@ metadata:
7771
namespace: default
7872
spec:
7973
managedPolicies:
80-
- policy1-common-example-sriov-sub-policy
74+
- ztp-group.group-du-sno-config-policy
8175
enable: false
8276
clusters:
8377
- spoke1
@@ -95,7 +89,7 @@ spec:
9589
$ oc create -f cgu-remove.yaml
9690
----
9791

98-
. Change the value of the `spec.enable` field to `true` by running the following command:
92+
. When you are ready to apply the changes, for example, during an appropriate maintenance window, change the value of the `spec.enable` field to `true` by running the following command:
9993
+
10094
[source,terminal]
10195
----
@@ -113,9 +107,9 @@ $ oc get <changed_cr>
113107
.Example output
114108
[source,terminal]
115109
----
116-
NAMESPACE NAME REMEDIATION ACTION COMPLIANCE STATE AGE
117-
default cgu-policy1-common-example-version-policy enforce 17m
118-
default policy1-common-example-version-policy inform NonCompliant 15h
110+
NAMESPACE NAME REMEDIATION ACTION COMPLIANCE STATE AGE
111+
default cgu-ztp-group.group-du-sno-config-policy enforce 17m
112+
default ztp-group.group-du-sno-config-policy inform NonCompliant 15h
119113
----
120114

121115
When the `COMPLIANCE STATE` of the policy is `Compliant`, it means that the CR is updated and the unwanted content is removed.

0 commit comments

Comments
 (0)