tigera / operator

Kubernetes operator for installing Calico and Calico Enterprise

Apache License 2.0

182 stars 138 forks source link

[release-v1.32] Auto pick #3164: Fix trusted-bundle conflict in ES secret controller (#3135) #3445

Closed caseydavenport closed 4 weeks ago

caseydavenport commented 1 month ago

Cherry pick of #3164 on release-v1.32.

3164: Fix trusted-bundle conflict in ES secret controller (#3135)

Original PR Body below

Description

Picking #3135 to the release-v1.33 branch.

For PR author

[ ] Tests for change.
[ ] If changing pkg/apis/, run make gen-files
[ ] If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

[ ] Milestone set according to targeted release.
[ ] Appropriate labels:
- 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.