LOG-6277: Fix LokiStack is not gathered even if it exists.

[kattz-kawa]

Description

The must-gather code[1] gathers LokiStack only when "lokistack" wasn't found in the result of "oc get crd".
It means that LokiStack isn't gathered even if it exists.

[1]

cluster-logging-operator/must-gather/collection-scripts/gather

Line 94 in b8e2d71

loki_crd=$(oc get crd -A -o custom-columns=:.metadata.name | grep lokistack)||

The current line should use && instead of ||. This change is important because, in bash, if the left expression of || is true, the right expression is not evaluated. By using &&, the right expression will be evaluated if LokiStack exists, ensuring that the information is gathered correctly.

Here is an example to demonstrate this point:

$ bash -c 'echo first expression || echo second expression'
first expression  # <--- second expression is not evaluated
$ bash -c 'echo first expression && echo second expression'
first expression
second expression

/cc @Clee2691
/assign @jcantrill

Links

JIRA: https://issues.redhat.com/browse/LOG-6277

[openshift-ci-robot]

@kattz-kawa: This pull request references LOG-6277 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.8.0" version, but no target version was set.

In response to this:

Description

The must-gather code[1] gathers LokiStack only when "lokistack" wasn't found in the result of "oc get crd".
It means that LokiStack isn't gathered even if it exists.

[1]

cluster-logging-operator/must-gather/collection-scripts/gather

Line 94 in b8e2d71

loki_crd=$(oc get crd -A -o custom-columns=:.metadata.name | grep lokistack)||

The current line should use && instead of ||. This change is important because, in bash, if the left expression of || is true, the right expression is not evaluated. By using &&, the right expression will be evaluated if LokiStack exists, ensuring that the information is gathered correctly.

Here is an example to demonstrate this point:

$ bash -c 'echo first expression || echo second expression'
first expression  # <--- second expression is not evaluated
$ bash -c 'echo first expression && echo second expression'
first expression
second expression

/cc @Clee2691
/assign @jcantrill

Links

JIRA: https://issues.redhat.com/browse/LOG-6277

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

Hi @kattz-kawa. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

[cahartma]

I believe the correct fix is to have two separate lines and no logical operator or list.

[kattz-kawa]

I agree with your point. It seems I misunderstood the significance of this logical operator. I will fix it into two separate lines and request a review again.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: kattz-kawa
Once this PR has been reviewed and has the lgtm label, please ask for approval from jcantrill. 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

[jcantrill]

/ok-to-test

[openshift-ci]

@kattz-kawa: 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-sigs/prow repository. I understand the commands that are listed here.

[jcantrill]

/hold