[TSLA-11619] Make GetKeyCertPEM select key/cert pair deterministically#5008
Merged
Conversation
Brian-McM
approved these changes
Jul 13, 2026
Contributor
|
/sem approve |
Contributor
|
/sem-approve |
87ed060 to
b28e353
Compare
Contributor
|
/sem-approve |
This file contains hidden or 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
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
What
GetKeyCertPEMranged over a Go map of key/cert field-name pairs, so when asecret held more than one recognized pair (e.g. standard
tls.crt/tls.keyalongside a legacy
cert/keykept during a cert-rotation overlap), thereturned cert was non-deterministic due to randomized map iteration.
Why
For the Voltron tunnel secret this flipped the KeyPair hash annotation between
reconciles, changing the
tigera-managerpod template hash and triggeringspurious Voltron rolling restarts that dropped managed-cluster tunnels.
Fix
Select the key/cert pair in a fixed priority order (standard
tls.crt/tls.keyfirst, then legacy names). Adds a regression test asserting deterministic
selection when both pairs are present.
Release Note
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.