Skip to content

ROX-29452: Fix confusing certrefresh logs #15464

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

Merged
vladbologa merged 1 commit into from
May 28, 2025
Merged

ROX-29452: Fix confusing certrefresh logs #15464

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
14 changes: 7 additions & 7 deletions sensor/kubernetes/certrefresh/cert_refresher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ func refreshCertificates(ctx context.Context, certsDescription string, requestCe
timeToNextRefresh, err = ensureCertificatesAreFresh(ctx, certsDescription, requestCertificates, getCertsRenewalTime, repository)
if err != nil {
if errors.Is(err, certrepo.ErrUnexpectedSecretsOwner) {
log.Errorf("non-recoverable error refreshing %s, automatic refresh will be stopped: %s", certsDescription, err)
log.Errorf("non-recoverable error refreshing %s TLS certificates, automatic refresh will be stopped: %s", certsDescription, err)
return 0, concurrency.ErrNonRecoverable
}

log.Errorf("refreshing %s: %s", certsDescription, err)
log.Errorf("refreshing %s TLS certificates: %s", certsDescription, err)
return 0, err
}

log.Infof("%v scheduled to be refreshed in %s", certsDescription, timeToNextRefresh)
log.Infof("%v TLS certificates scheduled to be refreshed in %s", certsDescription, timeToNextRefresh)
return timeToNextRefresh, err
}

Expand Down Expand Up @@ -82,7 +82,7 @@ func ensureCertificatesAreFresh(ctx context.Context, certsDescription string, re
return 0, err
}
serviceTypeNames := getServiceTypeNames(persistedCertificates)
log.Infof("successfully refreshed %v for: %v", certsDescription, strings.Join(serviceTypeNames, ", "))
log.Infof("successfully refreshed %v TLS certificates for: %v", certsDescription, strings.Join(serviceTypeNames, ", "))
return time.Until(renewalTime), nil
}

Expand All @@ -102,12 +102,12 @@ func getTimeToRefreshFromRepo(ctx context.Context, certsDescription string, getC
return 0, getCertsErr
}
if errors.Is(getCertsErr, certrepo.ErrDifferentCAForDifferentServiceTypes) || errors.Is(getCertsErr, certrepo.ErrMissingSecretData) {
log.Errorf("%s are in an inconsistent state, "+
log.Errorf("%s TLS certificates are in an inconsistent state, "+
"will refresh certificates immediately: %s", certsDescription, getCertsErr)
return 0, nil
}
if k8sErrors.IsNotFound(getCertsErr) {
log.Warnf("%s not found (this is expected on a new deployment), "+
log.Warnf("%s TLS certificates not found (this is expected on a new deployment), "+
"will refresh certificates immediately: %s", certsDescription, getCertsErr)
return 0, nil
}
Expand All @@ -118,7 +118,7 @@ func getTimeToRefreshFromRepo(ctx context.Context, certsDescription string, getC
renewalTime, err := getCertsRenewalTime(certificates)
if err != nil {
// recover by refreshing the certificates immediately.
log.Errorf("error getting %s expiration, "+
log.Errorf("error getting %s TLS certificates expiration, "+
"will refresh certificates immediately: %s", certsDescription, err)
return 0, nil
}
Expand Down
Loading