LOG-4817: Remove raw secrets from must-gather and update dir structure

[cahartma]

Description

For LOG-4817 the best solution is to remove this file from the 'oc get' under '/cluster-logging/clo' directory. There is already a list of sanitized secrets listed under each namespace.
The other changes are from PR 2257 below, are aligning docs and directory structure to be used with the 'omc' tool.

/cc @vparfonov @Clee2691
/assign @jcantrill

Links

• Collecting clusterlogging and clusterlogforwarder with inspect (#5) #2257

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cahartma

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [cahartma]

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

[vparfonov]

/lgtm

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD e5237d4 and 2 for PR HEAD 84005b7 in total

[cahartma]

/retest

[openshift-ci]

@cahartma: 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.

[oarribas]

This is already in logging must-gather 5.9, asking for backport to 5.8:

/cherry-pick release-5.8

[openshift-cherrypick-robot]

@oarribas: #2317 failed to apply on top of branch "release-5.8":

Applying: Remove raw secrets from must-gather and update dir structure
.git/rebase-apply/patch:53: trailing whitespace.
   │  │  │  └── [clf_name.yaml]   
.git/rebase-apply/patch:68: trailing whitespace.
   │  │  │           └── previous.log   
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	must-gather/collection-scripts/gather
M	must-gather/collection-scripts/gather_cluster_logging_operator_resources
Falling back to patching base and 3-way merge...
Auto-merging must-gather/collection-scripts/gather_cluster_logging_operator_resources
CONFLICT (content): Merge conflict in must-gather/collection-scripts/gather_cluster_logging_operator_resources
Auto-merging must-gather/collection-scripts/gather
CONFLICT (content): Merge conflict in must-gather/collection-scripts/gather
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove raw secrets from must-gather and update dir structure
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

This is already in logging must-gather 5.9, asking for backport to 5.8:

/cherry-pick release-5.8

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.

[jcantrill]

@oarribas please clone JIRA for backport

[oarribas]

@jcantrill , cloned.

Is the manual clone of the JIRA required because the cherry-pick failed?