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

LOG-1859: Continue to reconcile when cluster wide proxy is not enabled #1225

Merged
merged 1 commit into from Oct 27, 2021
Merged

LOG-1859: Continue to reconcile when cluster wide proxy is not enabled #1225

merged 1 commit into from Oct 27, 2021

Conversation

jcantrill
Copy link
Contributor

Description

This PR fixes:

  • Reconciliation of the collector when cluster wide proxy is not enabled
  • No longer causes an early return when trusted CA configmap is missing a CA

Links

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 20, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill

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 Oct 20, 2021
@jcantrill
Copy link
Contributor Author

/retest

@vparfonov
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 26, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 96b91aa into openshift:master Oct 27, 2021
pmoogi-redhat pushed a commit to pmoogi-redhat/cluster-logging-operator that referenced this pull request Apr 26, 2022
@openshift-merge-robot
Merge pull request openshift#1225 from jcantrill/log1859
a52fdd6 
LOG-1859: Continue to reconcile when cluster wide proxy is not enabled
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

@vparfonov vparfonov

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.

None yet
4 participants
@jcantrill @vparfonov @openshift-bot @openshift-merge-robot