Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-5.6] LOG-3609: Fix collector restart after creation #1856

Merged
merged 1 commit into from
Feb 13, 2023
Merged

[release-5.6] LOG-3609: Fix collector restart after creation #1856

merged 1 commit into from
Feb 13, 2023

Conversation

openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Feb 9, 2023 •
edited by jcantrill
Loading

This is an automated cherry-pick of #1848

/assign vimalk78

https://issues.redhat.com/browse/LOG-3608

@vimalk78
Fix collector restart after creation
84d467b 
  Collector gets restarted if collector is started without waiting for waiting for trusted ca-bundle config map to get created.
  Modified the reconcile logic to wait for trusted ca-bundle to get created.

  Log Collector SCC desires 4 volumes `"configMap"`,`"emptyDir"`,`"projected"`,`"secret"`, but CRC container adds another volume for `"hostpath"`.
  The SCC comparator does a reflect comparison, which fails because there is one extra Volume.
  Fixed the SCC comparator to check for desired volumes only.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 9, 2023
Merged
@jcantrill
Copy link
Contributor

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, openshift-cherrypick-robot

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2023
@vimalk78
Copy link
Contributor

/retest

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 10, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 10, 2023 •
edited by openshift-ci bot
Loading

@openshift-cherrypick-robot: This pull request references LOG-3609 which is a valid jira issue.

In response to this:

This is an automated cherry-pick of #1848

/assign vimalk78

https://issues.redhat.com/browse/LOG-3608

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
Copy link
Contributor

/retest
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 10, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 43a936e and 2 for PR HEAD 84d467b in total

@vimalk78
Copy link
Contributor

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 13, 2023

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-ocp-previous 84d467b link false /test e2e-ocp-previous
ci/prow/e2e-ocp-next 84d467b link false /test e2e-ocp-next

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.

@openshift-merge-robot openshift-merge-robot merged commit 3d9071d into openshift:release-5.6 Feb 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@syedriko syedriko Awaiting requested review from syedriko

@vimalk78 vimalk78 Awaiting requested review from vimalk78

Assignees

@vimalk78 vimalk78

@jcantrill jcantrill

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@openshift-cherrypick-robot @jcantrill @vimalk78 @openshift-ci-robot @openshift-merge-robot