TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-24 01:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/k8s-operator, k8s-operator: support Static Endpoints on ProxyGroups (#16115)

Browse Source 
updates: #14674

Signed-off-by: chaosinthecrd <tom@tmlabs.co.uk>
This commit is contained in:
Tom Meadows
2025-06-27 17:12:14 +01:00
committed by GitHub
parent 53f67c4396
commit f81baa2d56
16 changed files with 2244 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
cmd/k8s-operator/proxyclass_test.go
View File

@@ -131,9 +131,11 @@ func TestProxyClass(t *testing.T) {
proxyClass.Spec.StatefulSet.Pod.TailscaleInitContainer.Image = pc.Spec.StatefulSet.Pod.TailscaleInitContainer.Image
proxyClass.Spec.StatefulSet.Pod.TailscaleContainer.Env = []tsapi.Env{{Name: "TS_USERSPACE", Value: "true"}, {Name: "EXPERIMENTAL_TS_CONFIGFILE_PATH"}, {Name: "EXPERIMENTAL_ALLOW_PROXYING_CLUSTER_TRAFFIC_VIA_INGRESS"}}
})
expectedEvents := []string{"Warning CustomTSEnvVar ProxyClass overrides the default value for TS_USERSPACE env var for tailscale container. Running with custom values for Tailscale env vars is not recommended and might break in the future.",
expectedEvents := []string{
"Warning CustomTSEnvVar ProxyClass overrides the default value for TS_USERSPACE env var for tailscale container. Running with custom values for Tailscale env vars is not recommended and might break in the future.",
"Warning CustomTSEnvVar ProxyClass overrides the default value for EXPERIMENTAL_TS_CONFIGFILE_PATH env var for tailscale container. Running with custom values for Tailscale env vars is not recommended and might break in the future.",
"Warning CustomTSEnvVar ProxyClass overrides the default value for EXPERIMENTAL_ALLOW_PROXYING_CLUSTER_TRAFFIC_VIA_INGRESS env var for tailscale container. Running with custom values for Tailscale env vars is not recommended and might break in the future."}
"Warning CustomTSEnvVar ProxyClass overrides the default value for EXPERIMENTAL_ALLOW_PROXYING_CLUSTER_TRAFFIC_VIA_INGRESS env var for tailscale container. Running with custom values for Tailscale env vars is not recommended and might break in the future.",
}
expectReconciled(t, pcr, "", "test")
expectEvents(t, fr, expectedEvents)
@@ -176,6 +178,110 @@ func TestProxyClass(t *testing.T) {
expectEqual(t, fc, pc)
}
func TestValidateProxyClassStaticEndpoints(t *testing.T) {
for name, tc := range map[string]struct {
staticEndpointConfig *tsapi.StaticEndpointsConfig
valid bool
}{
"no_static_endpoints": {
staticEndpointConfig: nil,
valid: true,
},
"valid_specific_ports": {
staticEndpointConfig: &tsapi.StaticEndpointsConfig{
NodePort: &tsapi.NodePortConfig{
Ports: []tsapi.PortRange{
{Port: 3001},
{Port: 3005},
},
Selector: map[string]string{"kubernetes.io/hostname": "foobar"},
},
},
valid: true,
},
"valid_port_ranges": {
staticEndpointConfig: &tsapi.StaticEndpointsConfig{
NodePort: &tsapi.NodePortConfig{
Ports: []tsapi.PortRange{
{Port: 3000, EndPort: 3002},
{Port: 3005, EndPort: 3007},
},
Selector: map[string]string{"kubernetes.io/hostname": "foobar"},
},
},
valid: true,
},
"overlapping_port_ranges": {
staticEndpointConfig: &tsapi.StaticEndpointsConfig{
NodePort: &tsapi.NodePortConfig{
Ports: []tsapi.PortRange{
{Port: 1000, EndPort: 2000},
{Port: 1500, EndPort: 1800},
},
Selector: map[string]string{"kubernetes.io/hostname": "foobar"},
},
},
valid: false,
},
"clashing_port_and_range": {
staticEndpointConfig: &tsapi.StaticEndpointsConfig{
NodePort: &tsapi.NodePortConfig{
Ports: []tsapi.PortRange{
{Port: 3005},
{Port: 3001, EndPort: 3010},
},
Selector: map[string]string{"kubernetes.io/hostname": "foobar"},
},
},
valid: false,
},
"malformed_port_range": {
staticEndpointConfig: &tsapi.StaticEndpointsConfig{
NodePort: &tsapi.NodePortConfig{
Ports: []tsapi.PortRange{
{Port: 3001, EndPort: 3000},
},
Selector: map[string]string{"kubernetes.io/hostname": "foobar"},
},
},
valid: false,
},
"empty_selector": {
staticEndpointConfig: &tsapi.StaticEndpointsConfig{
NodePort: &tsapi.NodePortConfig{
Ports: []tsapi.PortRange{{Port: 3000}},
Selector: map[string]string{},
},
},
valid: true,
},
} {
t.Run(name, func(t *testing.T) {
fc := fake.NewClientBuilder().
WithScheme(tsapi.GlobalScheme).
Build()
zl, _ := zap.NewDevelopment()
pcr := &ProxyClassReconciler{
logger: zl.Sugar(),
Client: fc,
}
pc := &tsapi.ProxyClass{
Spec: tsapi.ProxyClassSpec{
StaticEndpoints: tc.staticEndpointConfig,
},
}
logger := pcr.logger.With("ProxyClass", pc)
err := pcr.validate(context.Background(), pc, logger)
valid := err == nil
if valid != tc.valid {
t.Errorf("expected valid=%v, got valid=%v, err=%v", tc.valid, valid, err)
}
})
}
}
func TestValidateProxyClass(t *testing.T) {
for name, tc := range map[string]struct {
pc *tsapi.ProxyClass
@@ -219,8 +325,12 @@ func TestValidateProxyClass(t *testing.T) {
},
} {
t.Run(name, func(t *testing.T) {
pcr := &ProxyClassReconciler{}
err := pcr.validate(context.Background(), tc.pc)
zl, _ := zap.NewDevelopment()
pcr := &ProxyClassReconciler{
logger: zl.Sugar(),
}
logger := pcr.logger.With("ProxyClass", tc.pc)
err := pcr.validate(context.Background(), tc.pc, logger)
valid := err == nil
if valid != tc.valid {
t.Errorf("expected valid=%v, got valid=%v, err=%v", tc.valid, valid, err)