mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

various: fix lint warnings

Browse Source 
Some lint warnings caught by running 'make lint' locally.

Updates #cleanup

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: I1534ed6f2f5e1eb029658906f9d62607dad98ca3
This commit is contained in:
Andrew Dunham
2024-06-06 16:56:16 -04:00
parent 34e8820301
commit e88a5dbc92
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/k8s-operator/sts.go
View File

@ -29,7 +29,6 @@ import (
"sigs.k8s.io/yaml"
"tailscale.com/client/tailscale"
"tailscale.com/ipn"
kubeutils "tailscale.com/k8s-operator"
tsoperator "tailscale.com/k8s-operator"
tsapi "tailscale.com/k8s-operator/apis/v1alpha1"
"tailscale.com/net/netutil"
@ -346,7 +345,7 @@ func (a *tailscaleSTSReconciler) createOrGetSecret(ctx context.Context, logger *
latest := tailcfg.CapabilityVersion(-1)
var latestConfig ipn.ConfigVAlpha
for key, val := range configs {
fn := kubeutils.TailscaledConfigFileNameForCap(key)
fn := tsoperator.TailscaledConfigFileNameForCap(key)
b, err := json.Marshal(val)
if err != nil {
return "", "", nil, fmt.Errorf("error marshalling tailscaled config: %w", err)
@ -776,7 +775,7 @@ func tailscaledConfig(stsC *tailscaleSTSConfig, newAuthkey string, oldSecret *co
if len(data) == 0 {
continue
}
v, err := kubeutils.CapVerFromFileName(k)
v, err := tsoperator.CapVerFromFileName(k)
if err != nil {
continue
}