Skip to content

Commit 9336a69

Browse files
authored
Merge pull request #65709 from bergerhoffer/OSDOCS-6195
OSDOCS#6195: Updating CLI reference docs for 4.14
2 parents c4ea4a8 + 2c21143 commit 9336a69

File tree

2 files changed

+228
-34
lines changed

2 files changed

+228
-34
lines changed

modules/oc-adm-by-example-content.adoc

Lines changed: 130 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ Mirror an operator-registry catalog
4343
oc adm catalog mirror file:///local/index/my/image:latest my-airgapped-registry.com
4444
4545
# Configure a cluster to use a mirrored registry
46-
oc apply -f manifests/imageContentSourcePolicy.yaml
46+
oc apply -f manifests/imageDigestMirrorSet.yaml
4747
4848
# Edit the mirroring mappings and mirror with "oc image mirror" manually
4949
oc adm catalog mirror --manifests-only quay.io/my/image:latest myregistry.com
5050
oc image mirror -f manifests/mapping.txt
5151
52-
# Delete all ImageContentSourcePolicies generated by oc adm catalog mirror
53-
oc delete imagecontentsourcepolicy -l operators.openshift.org/catalog=true
52+
# Delete all ImageDigestMirrorSets generated by oc adm catalog mirror
53+
oc delete imagedigestmirrorset -l operators.openshift.org/catalog=true
5454
----
5555

5656

@@ -79,6 +79,10 @@ Deny a certificate signing request
7979

8080

8181

82+
== oc adm copy-to-node
83+
Copies specified files to the node.
84+
85+
8286
== oc adm cordon
8387
Mark node as unschedulable
8488

@@ -193,13 +197,13 @@ Remove old OpenShift groups referencing missing records from an external provide
193197
# Prune all orphaned groups
194198
oc adm groups prune --sync-config=/path/to/ldap-sync-config.yaml --confirm
195199
196-
# Prune all orphaned groups except the ones from the blacklist file
197-
oc adm groups prune --blacklist=/path/to/blacklist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
200+
# Prune all orphaned groups except the ones from the denylist file
201+
oc adm groups prune --blacklist=/path/to/denylist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
198202
199-
# Prune all orphaned groups from a list of specific groups specified in a whitelist file
200-
oc adm groups prune --whitelist=/path/to/whitelist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
203+
# Prune all orphaned groups from a list of specific groups specified in an allowlist file
204+
oc adm groups prune --whitelist=/path/to/allowlist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
201205
202-
# Prune all orphaned groups from a list of specific groups specified in a whitelist
206+
# Prune all orphaned groups from a list of specific groups specified in a list
203207
oc adm groups prune groups/group_name groups/other_name --sync-config=/path/to/ldap-sync-config.yaml --confirm
204208
----
205209

@@ -229,8 +233,8 @@ Sync OpenShift groups with records from an external provider
229233
# Sync all groups except the ones from the blacklist file with an LDAP server
230234
oc adm groups sync --blacklist=/path/to/blacklist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
231235
232-
# Sync specific groups specified in a whitelist file with an LDAP server
233-
oc adm groups sync --whitelist=/path/to/whitelist.txt --sync-config=/path/to/sync-config.yaml --confirm
236+
# Sync specific groups specified in an allowlist file with an LDAP server
237+
oc adm groups sync --whitelist=/path/to/allowlist.txt --sync-config=/path/to/sync-config.yaml --confirm
234238
235239
# Sync all OpenShift groups that have been synced previously with an LDAP server
236240
oc adm groups sync --type=openshift --sync-config=/path/to/ldap-sync-config.yaml --confirm
@@ -263,12 +267,12 @@ Collect debugging data for a given resource
263267

264268

265269
== oc adm migrate icsp
266-
Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s).
270+
Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s)
267271

268272
.Example usage
269273
[source,bash,options="nowrap"]
270274
----
271-
# update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir
275+
# Update the imagecontentsourcepolicy.yaml file to a new imagedigestmirrorset file under the mydir directory
272276
oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir
273277
----
274278

@@ -310,7 +314,7 @@ Launch a new instance of a pod for gathering debug information
310314
# Gather information using a specific image stream plug-in
311315
oc adm must-gather --image-stream=openshift/must-gather:latest
312316
313-
# Gather information using a specific image, command, and pod-dir
317+
# Gather information using a specific image, command, and pod directory
314318
oc adm must-gather --image=my/image:tag --source-dir=/pod/directory -- myspecial-command.sh
315319
----
316320

@@ -337,7 +341,7 @@ Display and filter node logs
337341
# Show kubelet logs from all masters
338342
oc adm node-logs --role master -u kubelet
339343
340-
# See what logs are available in masters in /var/logs
344+
# See what logs are available in masters in /var/log
341345
oc adm node-logs --role master --path=/
342346
343347
# Display cron log file from all masters
@@ -346,6 +350,61 @@ Display and filter node logs
346350

347351

348352

353+
== oc adm ocp-certificates monitor-certificates
354+
Watch platform certificates.
355+
356+
.Example usage
357+
[source,bash,options="nowrap"]
358+
----
359+
# Watch platform certificates.
360+
oc adm ocp-certificates monitor-certificates
361+
----
362+
363+
364+
365+
== oc adm ocp-certificates regenerate-leaf
366+
Regenerate client and serving certificates of an OpenShift cluster
367+
368+
369+
370+
== oc adm ocp-certificates regenerate-machine-config-server-serving-cert
371+
Regenerate the machine config operator certificates in an OpenShift cluster
372+
373+
374+
375+
== oc adm ocp-certificates regenerate-top-level
376+
Regenerate the top level certificates in an OpenShift cluster
377+
378+
379+
380+
381+
== oc adm ocp-certificates remove-old-trust
382+
Remove old CAs from ConfigMaps representing platform trust bundles in an OpenShift cluster
383+
384+
.Example usage
385+
[source,bash,options="nowrap"]
386+
----
387+
# Remove only CA certificates created before a certain date from all trust bundles
388+
oc adm ocp-certificates remove-old-trust configmaps -A --all --created-before 2023-06-05T14:44:06Z
389+
----
390+
391+
392+
393+
== oc adm ocp-certificates update-ignition-ca-bundle-for-machine-config-server
394+
Update user-data secrets in an OpenShift cluster to use updated MCO certfs
395+
396+
.Example usage
397+
[source,bash,options="nowrap"]
398+
----
399+
# Regenerate the MCO certs without modifying user-data secrets
400+
oc adm certificates regenerate-machine-config-server-serving-cert --update-ignition=false
401+
402+
# Update the user-data secrets to use new MCS certs
403+
oc adm certificates update-ignition-ca-bundle-for-machine-config-server
404+
----
405+
406+
407+
349408
== oc adm pod-network isolate-projects
350409
Isolate project network
351410

@@ -513,13 +572,13 @@ Remove old OpenShift groups referencing missing records from an external provide
513572
# Prune all orphaned groups
514573
oc adm prune groups --sync-config=/path/to/ldap-sync-config.yaml --confirm
515574
516-
# Prune all orphaned groups except the ones from the blacklist file
517-
oc adm prune groups --blacklist=/path/to/blacklist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
575+
# Prune all orphaned groups except the ones from the denylist file
576+
oc adm prune groups --blacklist=/path/to/denylist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
518577
519-
# Prune all orphaned groups from a list of specific groups specified in a whitelist file
520-
oc adm prune groups --whitelist=/path/to/whitelist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
578+
# Prune all orphaned groups from a list of specific groups specified in an allowlist file
579+
oc adm prune groups --whitelist=/path/to/allowlist.txt --sync-config=/path/to/ldap-sync-config.yaml --confirm
521580
522-
# Prune all orphaned groups from a list of specific groups specified in a whitelist
581+
# Prune all orphaned groups from a list of specific groups specified in a list
523582
oc adm prune groups groups/group_name groups/other_name --sync-config=/path/to/ldap-sync-config.yaml --confirm
524583
----
525584

@@ -545,7 +604,7 @@ Remove unreferenced images
545604
# To actually perform the prune operation, the confirm flag must be appended
546605
oc adm prune images --prune-over-size-limit --confirm
547606
548-
# Force the insecure http protocol with the particular registry host name
607+
# Force the insecure HTTP protocol with the particular registry host name
549608
oc adm prune images --registry-url=http://registry.example.org --confirm
550609
551610
# Force a secure connection with a custom certificate authority to the particular registry host name
@@ -554,6 +613,24 @@ Remove unreferenced images
554613

555614

556615

616+
== oc adm reboot-machine-config-pool
617+
Initiate reboot of the specified MachineConfigPool.
618+
619+
.Example usage
620+
[source,bash,options="nowrap"]
621+
----
622+
# Reboot all MachineConfigPools
623+
oc adm reboot-machine-config-pool mcp/worker mcp/master
624+
625+
# Reboot all MachineConfigPools that inherit from worker. This include all custom MachineConfigPools and infra.
626+
oc adm reboot-machine-config-pool mcp/worker
627+
628+
# Reboot masters
629+
oc adm reboot-machine-config-pool mcp/master
630+
----
631+
632+
633+
557634
== oc adm release extract
558635
Extract the contents of an update payload to disk
559636

@@ -567,7 +644,7 @@ Extract the contents of an update payload to disk
567644
oc adm release extract --credentials-requests --cloud=aws
568645
569646
# Use git to check out the source code for the current cluster release to DIR from linux/s390x image
570-
# Note: Wildcard filter is not supported. Pass a single os/arch to extract
647+
# Note: Wildcard filter is not supported; pass a single os/arch to extract
571648
oc adm release extract --git=DIR quay.io/openshift-release-dev/ocp-release:4.11.2 --filter-by-os=linux/s390x
572649
----
573650

@@ -592,7 +669,7 @@ Display information about a release
592669
oc adm release info quay.io/openshift-release-dev/ocp-release:4.11.2 --pullspecs
593670
594671
# Show information about linux/s390x image
595-
# Note: Wildcard filter is not supported. Pass a single os/arch to extract
672+
# Note: Wildcard filter is not supported; pass a single os/arch to extract
596673
oc adm release info quay.io/openshift-release-dev/ocp-release:4.11.2 --filter-by-os=linux/s390x
597674
----
598675

@@ -632,7 +709,7 @@ Create a new OpenShift release
632709
.Example usage
633710
[source,bash,options="nowrap"]
634711
----
635-
# Create a release from the latest origin images and push to a DockerHub repo
712+
# Create a release from the latest origin images and push to a DockerHub repository
636713
oc adm release new --from-image-stream=4.11 -n origin --to-image docker.io/mycompany/myrepo:latest
637714
638715
# Create a new release with updated metadata from a previous release
@@ -649,6 +726,11 @@ Create a new OpenShift release
649726

650727

651728

729+
== oc adm restart-kubelet
730+
Restarts kubelet on the specified nodes
731+
732+
733+
652734
== oc adm taint
653735
Update the taints on one or more nodes
654736

@@ -752,7 +834,7 @@ Upgrade a cluster or adjust the upgrade channel
752834
.Example usage
753835
[source,bash,options="nowrap"]
754836
----
755-
# Review the available cluster updates
837+
# View the update status and available cluster updates
756838
oc adm upgrade
757839
758840
# Update to the latest version
@@ -785,3 +867,27 @@ Verify the image identity contained in the image signature
785867
----
786868

787869

870+
871+
== oc adm wait-for-node-reboot
872+
Wait for nodes to reboot after running `oc adm reboot-machine-config-pool`
873+
874+
.Example usage
875+
[source,bash,options="nowrap"]
876+
----
877+
# Wait for all nodes to complete a requested reboot from 'oc adm reboot-machine-config-pool mcp/worker mcp/master'
878+
oc adm wait-for-node-reboot nodes --all
879+
880+
# Wait for masters to complete a requested reboot from 'oc adm reboot-machine-config-pool mcp/master'
881+
oc adm wait-for-node-reboot nodes -l node-role.kubernetes.io/master
882+
883+
# Wait for masters to complete a specific reboot
884+
oc adm wait-for-node-reboot nodes -l node-role.kubernetes.io/master --reboot-number=4
885+
----
886+
887+
888+
889+
== oc adm wait-for-stable-cluster
890+
wait for the platform operators to become stable
891+
892+
893+

0 commit comments

Comments
 (0)