-
Notifications
You must be signed in to change notification settings - Fork 142
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
Fix trusted-bundle conflict in ES secret controller #3135
Merged
caseydavenport
merged 15 commits into
tigera:master
from
caseydavenport:casey-fix-cert-management
Jan 25, 2024
Merged
Fix trusted-bundle conflict in ES secret controller #3135
caseydavenport
merged 15 commits into
tigera:master
from
caseydavenport:casey-fix-cert-management
Jan 25, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
caseydavenport
commented
Jan 18, 2024
caseydavenport
commented
Jan 18, 2024
caseydavenport
commented
Jan 18, 2024
caseydavenport
commented
Jan 18, 2024
asincu
reviewed
Jan 23, 2024
9c7a1bf
to
5cdf410
Compare
rene-dekker
reviewed
Jan 23, 2024
rene-dekker
approved these changes
Jan 23, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
rene-dekker
reviewed
Jan 24, 2024
tmjd
pushed a commit
to tmjd/operator
that referenced
this pull request
Feb 12, 2024
5 tasks
tmjd
added a commit
that referenced
this pull request
Feb 13, 2024
Fix trusted-bundle conflict in ES secret controller [pick #3135 r1.33]
5 tasks
caseydavenport
added a commit
to caseydavenport/operator
that referenced
this pull request
Jul 26, 2024
Closed
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This controller is a bit complicated, but it tries to manage a few things:
It needs to do this differently depending on:
The bug this PR fixes occurred when using external ES in a single-tenant system. In this case, we would attempt to write two trusted bundles into the tigera-elasticsearch Namespace with conflicting contents, resulting in the tigera-ca-bundle ConfigMap oscillating between two states.
We need to make sure that this code:
For PR author
make gen-files
make gen-versions
For PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bug
if this is a bugfix.kind/enhancement
if this is a a new feature.enterprise
if this PR applies to Calico Enterprise only.