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.

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

LOG-3609: Fix collector restart after creation #1848

Merged

Conversation

vimalk78
Copy link
Contributor

@vimalk78 vimalk78 commented Feb 7, 2023

Description

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.

/cc
/assign

/cherry-pick

Links

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vimalk78

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 7, 2023
@vimalk78
Copy link
Contributor Author

vimalk78 commented Feb 7, 2023

/retest

@vimalk78 vimalk78 changed the title Fix collector restart after creation LOG-3609: Fix collector restart after creation Feb 7, 2023
@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 7, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 7, 2023

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

In response to this:

Description

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.

/cc
/assign

/cherry-pick

Links

  • Depending on PR(s):
  • Bugzilla:
  • Github issue:
  • JIRA:
  • Enhancement proposal:

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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 7, 2023

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

In response to this:

Description

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.

/cc
/assign

/cherry-pick

Links

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.

@vimalk78
Copy link
Contributor Author

vimalk78 commented Feb 7, 2023

/retest

@jcantrill
Copy link
Contributor

/lgtm

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

/retest-required

Remaining retests: 0 against base HEAD d9b86c6 and 2 for PR HEAD e9c2e01 in total

@vimalk78
Copy link
Contributor Author

vimalk78 commented Feb 8, 2023

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD af2bf6d and 1 for PR HEAD e9c2e01 in total

  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-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 8, 2023
@vimalk78
Copy link
Contributor Author

vimalk78 commented Feb 8, 2023

/retest

1 similar comment
@vimalk78
Copy link
Contributor Author

vimalk78 commented Feb 8, 2023

/retest

Copy link
Contributor

@jcantrill jcantrill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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

/retest-required

Remaining retests: 0 against base HEAD af2bf6d and 2 for PR HEAD 413f4dc in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 9, 2023

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

Copy link
Contributor

@jcantrill jcantrill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2023
@openshift-merge-robot openshift-merge-robot merged commit 99515a9 into openshift:master Feb 9, 2023
@vimalk78
Copy link
Contributor Author

vimalk78 commented Feb 9, 2023

/cherry-pick release-5.6

@openshift-cherrypick-robot

@vimalk78: new pull request created: #1856

In response to this:

/cherry-pick release-5.6

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants