Skip to content

Commit c78aa47

Browse files
authored
Merge pull request #89489 from mburke5678/node-disrupt-fix
OCPBUGS:35825 Chronyd examples for nodeDisruptionPolicy are wrong/example of node disruption policy is incorrect/Missing metadata in one of the Node Disruption Policy examples
2 parents 9884ba0 + 31a816c commit c78aa47

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

modules/machine-config-node-disruption-config.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ spec:
3434
nodeDisruptionPolicy: <1>
3535
files: # <2>
3636
- actions: # <3>
37-
- reload: # <4>
37+
- restart: # <4>
3838
serviceName: chronyd.service # <5>
39-
type: Reload
39+
type: Restart
4040
path: /etc/chrony.conf # <6>
4141
sshkey: # <7>
4242
actions:
@@ -93,9 +93,9 @@ status:
9393
files:
9494
# ...
9595
- actions:
96-
- reload:
96+
- restart:
9797
serviceName: chronyd.service
98-
type: Reload
98+
type: Restart
9999
path: /etc/chrony.conf
100100
sshkey:
101101
actions:

modules/machine-config-node-disruption-example.adoc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The following example `MachineConfiguration` object shows no user defined polici
2020
----
2121
apiVersion: operator.openshift.io/v1
2222
kind: MachineConfiguration
23+
metadata:
2324
name: cluster
2425
spec:
2526
logLevel: Normal
@@ -79,7 +80,6 @@ apiVersion: operator.openshift.io/v1
7980
kind: MachineConfiguration
8081
metadata:
8182
name: cluster
82-
namespace: openshift-machine-config-operator
8383
# ...
8484
spec:
8585
nodeDisruptionPolicy:
@@ -96,7 +96,7 @@ spec:
9696
# ...
9797
----
9898

99-
In the following example, when changes are made to the `/etc/chrony.conf` file, the MCO reloads the `chronyd.service` on the cluster nodes. If files are added to or modified in the `/var/run` directory, the MCO applies the changes with no further action.
99+
In the following example, when changes are made to the `/etc/chrony.conf` file, the MCO restarts the `chronyd.service` on the cluster nodes. If files are added to or modified in the `/var/run` directory, the MCO applies the changes with no further action.
100100

101101
.Example node disruption policy for a configuration file change
102102
[source,yaml]
@@ -105,15 +105,14 @@ apiVersion: operator.openshift.io/v1
105105
kind: MachineConfiguration
106106
metadata:
107107
name: cluster
108-
namespace: openshift-machine-config-operator
109108
# ...
110109
spec:
111110
nodeDisruptionPolicy:
112111
files:
113112
- actions:
114-
- reload:
113+
- restart:
115114
serviceName: chronyd.service
116-
type: Reload
115+
type: Restart
117116
path: /etc/chrony.conf
118117
- actions:
119118
- type: None
@@ -129,7 +128,6 @@ apiVersion: operator.openshift.io/v1
129128
kind: MachineConfiguration
130129
metadata:
131130
name: cluster
132-
namespace: openshift-machine-config-operator
133131
# ...
134132
spec:
135133
nodeDisruptionPolicy:
@@ -155,7 +153,6 @@ apiVersion: operator.openshift.io/v1
155153
kind: MachineConfiguration
156154
metadata:
157155
name: cluster
158-
namespace: openshift-machine-config-operator
159156
# ...
160157
spec:
161158
nodeDisruptionPolicy:

0 commit comments

Comments
 (0)