Skip to content

[release-v1.40] Use pod-network k8s service endpoint for non-cluster-host Typha #4841

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

Merged
caseydavenport merged 2 commits into from
May 22, 2026
+30 −0
Merged

[release-v1.40] Use pod-network k8s service endpoint for non-cluster-host Typha #4841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ac27ec
Strip apiserver endpoint env vars on non-cluster-host Typha
caseydavenport May 21, 2026
215ba6a
Use slices.DeleteFunc to strip apiserver endpoint env vars
caseydavenport May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/render/typha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package render

import (
"fmt"
"slices"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -666,6 +667,14 @@ func (c *typhaComponent) typhaEnvVarsNonClusterHost() []corev1.EnvVar {
envVars = replaceOrAppendEnvVar(envVars, "TYPHA_CLIENTCN", c.cfg.TLS.NodeNonClusterHostCommonName)
envVars = replaceOrAppendEnvVar(envVars, "TYPHA_CLIENTURISAN", c.cfg.TLS.NodeNonClusterHostURISAN)

// NCH Typha runs pod-networked, so the host-network apiserver endpoint
// (e.g. MKE's proxy.local) may not be reachable. Strip the inherited env
// vars so we fall back to the default kubernetes Service that kubelet
// injects into every pod.
envVars = slices.DeleteFunc(envVars, func(e corev1.EnvVar) bool {
return e.Name == "KUBERNETES_SERVICE_HOST" || e.Name == "KUBERNETES_SERVICE_PORT"
})

// Tell the health aggregator to listen on all interfaces.
envVars = append(envVars, corev1.EnvVar{Name: "TYPHA_HEALTHHOST", Value: "0.0.0.0"})
return envVars
Expand Down
21 changes: 21 additions & 0 deletions pkg/render/typha_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,27 @@ var _ = Describe("Typha rendering tests", func() {
Expect(d.Spec.Template.Spec.Containers[0].ReadinessProbe.ProbeHandler.HTTPGet.Host).To(BeEmpty())
})

It("should strip the host-network apiserver endpoint from the non-cluster-host Typha", func() {
cfg.K8sServiceEp = k8sapi.ServiceEndpoint{Host: "proxy.local", Port: "6444"}

component := render.Typha(&cfg)
resources, _ := component.Objects()

// NCH Typha is pod-networked; let kubelet's default service injection take over.
d := rtest.GetResource(resources, "calico-typha-noncluster-host", "calico-system", "apps", "v1", "Deployment").(*appsv1.Deployment)
for _, e := range d.Spec.Template.Spec.Containers[0].Env {
Expect(e.Name).ToNot(Equal("KUBERNETES_SERVICE_HOST"))
Expect(e.Name).ToNot(Equal("KUBERNETES_SERVICE_PORT"))
}

// The host-networked Typha still gets the configured endpoint.
dMain := rtest.GetResource(resources, "calico-typha", "calico-system", "apps", "v1", "Deployment").(*appsv1.Deployment)
Expect(dMain.Spec.Template.Spec.Containers[0].Env).To(ContainElements(
corev1.EnvVar{Name: "KUBERNETES_SERVICE_HOST", Value: "proxy.local"},
corev1.EnvVar{Name: "KUBERNETES_SERVICE_PORT", Value: "6444"},
))
})

It("should use custom client common name when specified for non-cluster host Typha deployment", func() {
cfg.TLS.NodeNonClusterHostCommonName = "custom-nch-cn"
component := render.Typha(&cfg)
Expand Down
Loading