mirror of
https://github.com/tailscale/tailscale.git
synced 2025-07-31 00:03:47 +00:00
{,cmd/}k8s-operator: minor nits self-review
Change-Id: Ic6fb93cefa9f7cd7e30c5e4f45c03f58d7a102f8 Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
This commit is contained in:
parent
0e605c53c8
commit
68b56d4b48
@ -963,10 +963,6 @@ func pgTailscaledConfig(pg *tsapi.ProxyGroup, pc *tsapi.ProxyClass, idx int32, a
|
|||||||
conf.ServerURL = &loginServer
|
conf.ServerURL = &loginServer
|
||||||
}
|
}
|
||||||
|
|
||||||
if pg.Spec.HostnamePrefix != "" {
|
|
||||||
conf.Hostname = ptr.To(fmt.Sprintf("%s-%d", pg.Spec.HostnamePrefix, idx))
|
|
||||||
}
|
|
||||||
|
|
||||||
if shouldAcceptRoutes(pc) {
|
if shouldAcceptRoutes(pc) {
|
||||||
conf.AcceptRoutes = "true"
|
conf.AcceptRoutes = "true"
|
||||||
}
|
}
|
||||||
|
@ -427,10 +427,9 @@ func pgRole(pg *tsapi.ProxyGroup, namespace string) *rbacv1.Role {
|
|||||||
},
|
},
|
||||||
ResourceNames: func() (secrets []string) {
|
ResourceNames: func() (secrets []string) {
|
||||||
for i := range pgReplicas(pg) {
|
for i := range pgReplicas(pg) {
|
||||||
podName := pgPodName(pg.Name, i)
|
|
||||||
secrets = append(secrets,
|
secrets = append(secrets,
|
||||||
pgConfigSecretName(pg.Name, i), // Config with auth key.
|
pgConfigSecretName(pg.Name, i), // Config with auth key.
|
||||||
podName, // State.
|
pgPodName(pg.Name, i), // State.
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
return secrets
|
return secrets
|
||||||
|
@ -226,6 +226,4 @@ const (
|
|||||||
|
|
||||||
IngressSvcValid ConditionType = `TailscaleIngressSvcValid`
|
IngressSvcValid ConditionType = `TailscaleIngressSvcValid`
|
||||||
IngressSvcConfigured ConditionType = `TailscaleIngressSvcConfigured`
|
IngressSvcConfigured ConditionType = `TailscaleIngressSvcConfigured`
|
||||||
|
|
||||||
APIServerProxyReady ConditionType = `APIServerProxyReady`
|
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user