Skip to content

containerboot: retrigger cert loops on netmap updates #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ryantm wants to merge 1 commit into
base: zerg/operator-wildcard-cert
Choose a base branch
from
Draft

containerboot: retrigger cert loops on netmap updates #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmd/containerboot/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ authLoop:
currentIPs deephash.Sum // tailscale IPs assigned to device
currentDeviceID deephash.Sum // device ID
currentDeviceEndpoints deephash.Sum // device FQDN and IPs
currentCertDomains []string

currentEgressIPs deephash.Sum

Expand Down Expand Up @@ -653,12 +654,15 @@ runLoop:
backendAddrs = newBackendAddrs
}
if cfg.ServeConfigPath != "" {
newCertDomains := append([]string(nil), n.NetMap.DNS.CertDomains...)
certDomainsHaveChanged := !slices.Equal(currentCertDomains, newCertDomains)
currentCertDomains = newCertDomains
cd := certDomainFromNetmap(n.NetMap)
if cd == "" {
cd = kubetypes.ValueNoHTTPS
}
prev := certDomain.Swap(new(cd))
if prev == nil || *prev != cd {
if prev == nil || *prev != cd || certDomainsHaveChanged {
select {
case certDomainChanged <- true:
default:
Expand Down
20 changes: 10 additions & 10 deletions cmd/containerboot/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,18 @@ func watchServeConfigChanges(ctx context.Context, cdChanged <-chan bool, certDom
log.Printf("serve proxy: no serve config at %q, skipping", cfg.ServeConfigPath)
continue
}
if prevServeConfig != nil && reflect.DeepEqual(sc, prevServeConfig) {
continue
}
if err := updateServeConfig(ctx, sc, certDomain, klc.New(lc)); err != nil {
log.Fatalf("serve proxy: error updating serve config: %v", err)
}
if kc != nil && kc.canPatch {
if err := kc.storeHTTPSEndpoint(ctx, certDomain); err != nil {
log.Fatalf("serve proxy: error storing HTTPS endpoint: %v", err)
configChanged := prevServeConfig == nil || !reflect.DeepEqual(sc, prevServeConfig)
if configChanged {
if err := updateServeConfig(ctx, sc, certDomain, klc.New(lc)); err != nil {
log.Fatalf("serve proxy: error updating serve config: %v", err)
}
if kc != nil && kc.canPatch {
if err := kc.storeHTTPSEndpoint(ctx, certDomain); err != nil {
log.Fatalf("serve proxy: error storing HTTPS endpoint: %v", err)
}
}
prevServeConfig = sc
}
prevServeConfig = sc
if cfg.CertShareMode != "rw" {
continue
}
Expand Down
Loading