[release-v1.42] Strip apiserver endpoint env vars on non-cluster-host Typha by default#4847
Merged
caseydavenport merged 1 commit intoMay 22, 2026
Conversation
tigera#4846) * Strip apiserver endpoint env vars on non-cluster-host Typha by default The non-cluster-host Typha is pod-networked, so it should use the default in-cluster kubernetes Service that kubelet injects into every pod. Always strip the inherited KUBERNETES_SERVICE_HOST/PORT (which come from the host-network endpoint, e.g. proxy.local on MKE) and only override when a pod-network endpoint is explicitly configured. * Use slices.DeleteFunc instead of bespoke env-var filter helper
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.
Cherry-pick of #4846 (follow-up to #4840 / #4842) to
release-v1.42. Requested for inclusion in the v3.23.1 patch release.The non-cluster-host Typha runs pod-networked but inherits
KUBERNETES_SERVICE_HOST/PORTfrom the host-network endpoint. The earlier cherry-pick (#4842) only overrode those env vars when a pod-network endpoint was explicitly configured, which left the MKE failure mode in place when the customer hadn't set one. This change always strips the inherited host-network values so kubelet's default-service injection takes over, then re-adds the pod-network endpoint if one was configured.Clean cherry-pick.
Related: https://tigera.atlassian.net/browse/CI-1987