Collecting clusterlogging and clusterlogforwarder with inspect (#5)

[oarribas]

Description

Get the clusterlogging and clusterlogforwarder with the oc adm inspect command to allow working with those resources with omc like in a "live" cluster. Due to this, it's no longer needed to get them again and put them into the clo directory.
The customresourcedefinitions are also required to allow omc to work with above (and other) resources (on testing, it adds only few MB to the full must-gather size for ~200 customresourcedefinitions).

Added a "Moved resources" section to the must-gather README to explain how to work with the clusterlogging and clusterlogforwarder after this change.

/cc @periklis @cahartma @jcantrill
/assign @cahartma

/cherry-pick release-5.8

Links

• Replaces LOG-4792: Collecting clusterlogging and clusterlogforwarder with inspect #2255 and maybe also LOG-4792 Quick fix must-gather to preserve white-spaces #2256

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: oarribas
Once this PR has been reviewed and has the lgtm label, please assign cahartma for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[oarribas]

/retest

[openshift-ci]

@oarribas: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[jcantrill]

/hold

[jcantrill]

@oarribas have you tested the results of these changes. I like the intent but based upon your comments it would suggest 'openshift-logging' is still being collected like any other. Line 32, however, suggests to me that we are intentionally skipping that namespace https://github.com/openshift/cluster-logging-operator/pull/2257/files#diff-e5c2a69519b4a8fddd46d182316399558c9fd41434650a1196c7a9beaa14ada0R32 . Please verify. It would be also useful to write a JIRA ticket to express what we are fixing so that it can be included with an errata. Please do so.

[oarribas]

@jcantrill , I think that namespace is intentionally not checked there because it's added always [1] (for the non-multi-forwarder configurations), and with this PR the clusterlogging and clusterlogforwarder are now collected by [2].

The logs generated by [2] shows the following:

[...]
2023-11-17 10:47:16 END inspecting namespace openshift-logging/events ...
2023-11-17 10:47:16 BEGIN inspecting namespace openshift-logging/clusterlogging ...
Wrote inspect data to /tmp/must-gather.
2023-11-17 10:47:16 END inspecting namespace openshift-logging/clusterlogging ...
2023-11-17 10:47:16 BEGIN inspecting namespace openshift-logging/clusterlogforwarder ...
Wrote inspect data to /tmp/must-gather.
2023-11-17 10:47:17 END inspecting namespace openshift-logging/clusterlogforwarder ...
2023-11-17 10:47:17 BEGIN inspecting namespace openshift-operators-redhat/pods ...
Wrote inspect data to /tmp/must-gather.
[...]

Checking the generated must-gather directory, the following

$ find . -name "clusterlog*"
./cluster-logging/clo/clusterlogging_instance.txt
./namespaces/openshift-logging/logging.openshift.io/clusterloggings
./namespaces/openshift-logging/logging.openshift.io/clusterlogforwarders
./namespaces/default/logging.openshift.io/clusterlogforwarders
./namespaces/test-httpd/logging.openshift.io/clusterlogforwarders
[...]

$ ls -ltrh namespaces/openshift-logging/logging.openshift.io/clusterloggings/ namespaces/openshift-logging/logging.openshift.io/clusterlogforwarders/ namespaces/default/logging.openshift.io/clusterlogforwa
rders/ namespaces/test-httpd/logging.openshift.io/clusterlogforwarders/

namespaces/openshift-logging/logging.openshift.io/clusterloggings/:
total 4.0K
-rwxr-xr-x. 1 x x 3.0K Nov 17 10:47 instance.yaml

namespaces/openshift-logging/logging.openshift.io/clusterlogforwarders/:
total 4.0K
-rwxr-xr-x. 1 x x 1.9K Nov 17 10:47 instance.yaml

namespaces/default/logging.openshift.io/clusterlogforwarders/:
total 4.0K
-rwxr-xr-x. 1 x x 810 Nov 17 10:47 instance.yaml

namespaces/test-httpd/logging.openshift.io/clusterlogforwarders/:
total 4.0K
-rwxr-xr-x. 1 x x 816 Nov 17 10:47 instance.yaml

Maybe we can use jira LOG-4792 to document this, as this will also fix that issue?

[1] https://github.com/openshift/cluster-logging-operator/pull/2257/files#diff-e5c2a69519b4a8fddd46d182316399558c9fd41434650a1196c7a9beaa14ada0R24
[2] https://github.com/openshift/cluster-logging-operator/pull/2257/files#diff-e5c2a69519b4a8fddd46d182316399558c9fd41434650a1196c7a9beaa14ada0R69-R84

[openshift-merge-robot]

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[cahartma]

@oarribas if you will rebase your changes and force push, I will verify the changes and get this merged. We can then backport to 5.8 and update the Jira accordingly.

[cahartma]

Going to close this and add these changes to the PR for LOG-4817

[cahartma]

/close

[openshift-ci]

@cahartma: Closed this PR.

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.