TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-09 09:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/containerboot: don't attempt to patch a Secret field without permissions (#14365)

Browse Source 
Signed-off-by: Irbe Krumina <irbe@tailscale.com>
This commit is contained in:
Irbe Krumina 2024-12-11 14:58:44 +00:00 committed by GitHub
parent f1ccdcc713
commit 6e552f66a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/containerboot/kube.go
View File

@ -24,6 +24,7 @@ import (
type kubeClient struct { type kubeClient struct {
kubeclient.Client kubeclient.Client
stateSecret string stateSecret string
canPatch bool // whether the client has permissions to patch Kubernetes Secrets
} }
func newKubeClient(root string, stateSecret string) (*kubeClient, error) { func newKubeClient(root string, stateSecret string) (*kubeClient, error) {

2
cmd/containerboot/serve.go
View File

@ -72,7 +72,7 @@ func watchServeConfigChanges(ctx context.Context, path string, cdChanged <-chan
if err := updateServeConfig(ctx, sc, certDomain, lc); err != nil { if err := updateServeConfig(ctx, sc, certDomain, lc); err != nil {
log.Fatalf("serve proxy: error updating serve config: %v", err) log.Fatalf("serve proxy: error updating serve config: %v", err)
} }
if kc != nil { if kc != nil && kc.canPatch {
if err := kc.storeHTTPSEndpoint(ctx, certDomain); err != nil { if err := kc.storeHTTPSEndpoint(ctx, certDomain); err != nil {
log.Fatalf("serve proxy: error storing HTTPS endpoint: %v", err) log.Fatalf("serve proxy: error storing HTTPS endpoint: %v", err)
} }

1
cmd/containerboot/settings.go
View File

@ -217,6 +217,7 @@ func (cfg *settings) setupKube(ctx context.Context, kc *kubeClient) error {
return fmt.Errorf("some Kubernetes permissions are missing, please check your RBAC configuration: %v", err) return fmt.Errorf("some Kubernetes permissions are missing, please check your RBAC configuration: %v", err)
} }
cfg.KubernetesCanPatch = canPatch cfg.KubernetesCanPatch = canPatch
kc.canPatch = canPatch
s, err := kc.GetSecret(ctx, cfg.KubeSecret) s, err := kc.GetSecret(ctx, cfg.KubeSecret)
if err != nil { if err != nil {