From 68b56d4b488cd4b85aa15d2b0ca921f7296f16e9 Mon Sep 17 00:00:00 2001 From: Tom Proctor Date: Mon, 7 Jul 2025 11:09:09 +0100 Subject: [PATCH] {,cmd/}k8s-operator: minor nits self-review Change-Id: Ic6fb93cefa9f7cd7e30c5e4f45c03f58d7a102f8 Signed-off-by: Tom Proctor --- cmd/k8s-operator/proxygroup.go | 4 ---- cmd/k8s-operator/proxygroup_specs.go | 3 +-- k8s-operator/apis/v1alpha1/types_connector.go | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cmd/k8s-operator/proxygroup.go b/cmd/k8s-operator/proxygroup.go index 057f13c0f..12a4334ca 100644 --- a/cmd/k8s-operator/proxygroup.go +++ b/cmd/k8s-operator/proxygroup.go @@ -963,10 +963,6 @@ func pgTailscaledConfig(pg *tsapi.ProxyGroup, pc *tsapi.ProxyClass, idx int32, a conf.ServerURL = &loginServer } - if pg.Spec.HostnamePrefix != "" { - conf.Hostname = ptr.To(fmt.Sprintf("%s-%d", pg.Spec.HostnamePrefix, idx)) - } - if shouldAcceptRoutes(pc) { conf.AcceptRoutes = "true" } diff --git a/cmd/k8s-operator/proxygroup_specs.go b/cmd/k8s-operator/proxygroup_specs.go index ab222da1c..2f040d5a8 100644 --- a/cmd/k8s-operator/proxygroup_specs.go +++ b/cmd/k8s-operator/proxygroup_specs.go @@ -427,10 +427,9 @@ func pgRole(pg *tsapi.ProxyGroup, namespace string) *rbacv1.Role { }, ResourceNames: func() (secrets []string) { for i := range pgReplicas(pg) { - podName := pgPodName(pg.Name, i) secrets = append(secrets, pgConfigSecretName(pg.Name, i), // Config with auth key. - podName, // State. + pgPodName(pg.Name, i), // State. ) } return secrets diff --git a/k8s-operator/apis/v1alpha1/types_connector.go b/k8s-operator/apis/v1alpha1/types_connector.go index a4cfa213e..88fd07346 100644 --- a/k8s-operator/apis/v1alpha1/types_connector.go +++ b/k8s-operator/apis/v1alpha1/types_connector.go @@ -226,6 +226,4 @@ const ( IngressSvcValid ConditionType = `TailscaleIngressSvcValid` IngressSvcConfigured ConditionType = `TailscaleIngressSvcConfigured` - - APIServerProxyReady ConditionType = `APIServerProxyReady` )