Skip to content

fix(cert-manager): await profile slug resolution before certificate issuance #175

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

Open
jdoss wants to merge 2 commits into
base: main
Choose a base branch
from
+349 −49
Open

fix(cert-manager): await profile slug resolution before certificate issuance #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62686d2
fix(cert-manager): await profile slug resolution before certificate i…
jdoss Apr 10, 2026
d069070
fix: address review feedback and use lifecycle config for retries
jdoss Apr 10, 2026
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
109 changes: 60 additions & 49 deletions packages/cmd/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,6 @@ type AgentManager struct {
newAccessTokenNotificationChan chan bool
cachedUniversalAuthClientSecret string
templateFirstRenderOnce map[int]*sync.Once // Track first render per template
certificateFirstIssueOnce map[int]*sync.Once // Track first issue per certificate
exitAfterAuth bool
revokeCredentialsOnShutdown bool

Expand Down Expand Up @@ -1131,22 +1130,18 @@ func NewAgentManager(options NewAgentMangerOptions) *AgentManager {

certificates := make([]CertificateWithID, len(options.Certificates))
certificateStates := make(map[int]*CertificateState)
certificateFirstIssueOnce := make(map[int]*sync.Once)
for i, certificate := range options.Certificates {
certificates[i] = CertificateWithID{ID: i + 1, Certificate: certificate}
certificateStates[i+1] = &CertificateState{
Status: "pending",
}
certificateFirstIssueOnce[i+1] = &sync.Once{}
}

agentManager := &AgentManager{
filePaths: options.FileDeposits,
templates: templates,
certificates: certificates,
certificateStates: certificateStates,
certificateFirstIssueOnce: certificateFirstIssueOnce,

authConfigBytes: options.AuthConfigBytes,
authStrategy: options.AuthStrategy,
retryConfig: options.RetryConfig,
Expand Down Expand Up @@ -2508,12 +2503,32 @@ func (tm *AgentManager) MonitorCertificates(ctx context.Context) {
}

for _, cert := range tm.certificates {
tm.certificateFirstIssueOnce[cert.ID].Do(func() {
cert := cert
displayName := tm.getCertificateDisplayName(cert.ID, &cert.Certificate)
maxRetries := cert.Certificate.Lifecycle.MaxFailureRetries
retryForever := maxRetries == 0

baseDelay := 2 * time.Second
if d, err := parseDurationWithDays(cert.Certificate.Lifecycle.FailureRetryInterval); err == nil && d > 0 {
baseDelay = d
}

const maxBackoff = 5 * time.Minute
for attempt := 1; retryForever || attempt <= maxRetries; attempt++ {
if err := tm.IssueCertificate(cert.ID, &cert.Certificate); err != nil {
displayName := tm.getCertificateDisplayName(cert.ID, &cert.Certificate)
log.Error().Str("Certificate", displayName).Msgf("initial certificate issuance failed: %v", err)
log.Error().
Str("Certificate", displayName).
Int("attempt", attempt).
Msgf("initial certificate issuance failed: %v", err)
backoff := baseDelay * time.Duration(1<<uint(min(attempt-1, 8)))
if backoff > maxBackoff {
backoff = maxBackoff
}
time.Sleep(backoff)
} else {
break
}
})
}
}

for {
Expand Down Expand Up @@ -3116,38 +3131,6 @@ var agentCmd = &cobra.Command{

go tm.ManageTokenLifecycle()

if len(agentConfig.Certificates) > 0 {
go func() {
for {
if tm.getTokenUnsafe() != "" {
break
}
time.Sleep(100 * time.Millisecond)
}

httpClient, err := tm.createAuthenticatedClient()
if err != nil {
log.Error().Msgf("failed to create authenticated client for name resolution: %v", err)
return
}

err = resolveCertificateNameReferences(&agentConfig.Certificates, httpClient)
if err != nil {
log.Error().Msgf("failed to resolve certificate name references: %v", err)
return
}

for i := range tm.certificates {
for j := range agentConfig.Certificates {
if tm.certificates[i].ID == j+1 {
tm.certificates[i].Certificate = agentConfig.Certificates[j]
break
}
}
}
}()
}

var monitoredTemplatesFinished atomic.Int32

// when all templates have finished rendering once, we delete the unused leases from the cache.
Expand Down Expand Up @@ -3178,8 +3161,38 @@ var agentCmd = &cobra.Command{
}

if len(tm.certificates) > 0 {
log.Info().Msg("certificate management engine starting...")
go tm.MonitorCertificates(ctx)
go func() {
for {
if tm.getTokenUnsafe() != "" {
break
}
time.Sleep(100 * time.Millisecond)
}

httpClient, err := tm.createAuthenticatedClient()
if err != nil {
log.Error().Msgf("failed to create authenticated client for name resolution: %v", err)
return
}

err = resolveCertificateNameReferences(&agentConfig.Certificates, httpClient)
if err != nil {
log.Error().Msgf("failed to resolve certificate name references: %v", err)
return
}

for i := range tm.certificates {
for j := range agentConfig.Certificates {
if tm.certificates[i].ID == j+1 {
tm.certificates[i].Certificate = agentConfig.Certificates[j]
break
}
}
}

log.Info().Msg("certificate management engine starting...")
tm.MonitorCertificates(ctx)
}()
}

for {
Expand Down Expand Up @@ -3366,7 +3379,7 @@ var certManagerAgentCmd = &cobra.Command{

go tm.ManageTokenLifecycle()

if len(agentConfig.Certificates) > 0 {
if len(tm.certificates) > 0 {
go func() {
for {
if tm.getTokenUnsafe() != "" {
Expand Down Expand Up @@ -3395,12 +3408,10 @@ var certManagerAgentCmd = &cobra.Command{
}
}
}
}()
}

if len(tm.certificates) > 0 {
log.Info().Msg("certificate management engine starting...")
go tm.MonitorCertificates(ctx)
log.Info().Msg("certificate management engine starting...")
tm.MonitorCertificates(ctx)
}()
}

for {
Expand Down
Loading
Loading