Skip to content

Commit 9b33391

Browse files
authored
Merge pull request #96066 from openshift-cherrypick-robot/cherry-pick-96061-to-enterprise-4.17
[enterprise-4.17] OCPBUGS#57333-18: Added operators.openshift.io/must-gather-image to o…
2 parents 810034b + 20fc587 commit 9b33391

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

modules/must-gather-flags.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The flags listed in the following table are available to use with the `oc adm mu
1515

1616
|`--all-images`
1717
|`oc adm must-gather --all-images=false`
18-
|Collect `must-gather` data using the default image for all Operators on the cluster that are annotated with `operators.openshift.io/must-gather-image`.
18+
|Collect `must-gather` data by using the default image for all Operators on the cluster that are annotated with `operators.openshift.io/must-gather-image`.
1919

2020
|`--dest-dir`
2121
|`oc adm must-gather --dest-dir='<directory_name>'`

modules/osdk-csv-annotations-other.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ The following Operator annotations are optional.
2424
|`operatorframework.io/suggested-namespace-template`
2525
|Set a manifest for a `Namespace` object with the default node selector for the namespace specified.
2626

27+
|`operators.operatorframework.io/internal-objects`
28+
|Hides CRDs in the UI that are not meant for user manipulation.
29+
2730
|`operators.openshift.io/valid-subscription`
2831
|Free-form array for listing any specific subscriptions that are required to use the Operator. For example, `'["3Scale Commercial License", "Red Hat Managed Integration"]'`.
2932

30-
|`operators.operatorframework.io/internal-objects`
31-
|Hides CRDs in the UI that are not meant for user manipulation.
33+
|`operators.openshift.io/must-gather-image`
34+
|Collect must-gather data by using the default image for all Operators on the cluster that are annotated with `operators.openshift.io/must-gather-image`.
3235

3336
|===
3437

0 commit comments

Comments
 (0)