Skip to content

NO-JIRA: controller/servingcerts: Align log verbosity #323

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
tchap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NO-JIRA: controller/servingcerts: Align log verbosity #323

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
10 changes: 5 additions & 5 deletions pkg/controller/servingcert/controller/secret_creating_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (sc *serviceServingCertController) Sync(ctx context.Context, syncContext fa
}

func (sc *serviceServingCertController) generateCert(ctx context.Context, serviceCopy *corev1.Service) error {
klog.V(4).Infof("generating new cert for %s/%s", serviceCopy.GetNamespace(), serviceCopy.GetName())
klog.V(2).Infof("generating new cert for %s/%s", serviceCopy.GetNamespace(), serviceCopy.GetName())
if serviceCopy.Annotations == nil {
serviceCopy.Annotations = map[string]string{}
}
Expand All @@ -169,7 +169,7 @@ func (sc *serviceServingCertController) generateCert(ctx context.Context, servic
uidErr := fmt.Errorf("secret %s/%s does not have corresponding service UID %v", actualSecret.GetNamespace(), actualSecret.GetName(), serviceCopy.UID)
return sc.updateServiceFailure(ctx, serviceCopy, uidErr)
}
klog.V(4).Infof("renewing cert in existing secret %s/%s", secret.GetNamespace(), secret.GetName())
klog.V(2).Infof("renewing cert in existing secret %s/%s", secret.GetNamespace(), secret.GetName())
// Actually update the secret in the regeneration case (the secret already exists but we want to update to a new cert).
_, updateErr := sc.secretClient.Secrets(secret.GetNamespace()).Update(ctx, secret, metav1.UpdateOptions{})
if updateErr != nil {
Expand Down Expand Up @@ -239,12 +239,12 @@ func (sc *serviceServingCertController) requiresCertGeneration(service *corev1.S
func (sc *serviceServingCertController) secretRequiresCertGeneration(service *corev1.Service, secret *corev1.Secret) bool {
certs, err := cert.ParseCertsPEM(secret.Data[corev1.TLSCertKey])
if err != nil {
klog.V(4).Infof("warning: error parsing certificate data in %s/%s during regeneration check: %v",
klog.V(2).Infof("warning: error parsing certificate data in %s/%s during regeneration check: %v",
secret.Namespace, secret.Name, err)
return true
}
if len(certs) == 0 || certs[0] == nil {
klog.V(4).Infof("warning: no certs returned from ParseCertsPEM during regeneration check")
klog.V(2).Infof("warning: no certs returned from ParseCertsPEM during regeneration check")
return true
}
cert := certs[0]
Expand Down Expand Up @@ -303,7 +303,7 @@ func (sc *serviceServingCertController) updateServiceFailure(ctx context.Context
incrementFailureNumAnnotation(service)
_, updateErr := sc.serviceClient.Services(service.Namespace).Update(ctx, service, metav1.UpdateOptions{})
if updateErr != nil {
klog.V(4).Infof("warning: failed to update failure annotations on service %s: %v", service.Name, updateErr)
klog.V(2).Infof("warning: failed to update failure annotations on service %s: %v", service.Name, updateErr)
}
// Past the max retries means we've handled this failure enough, so forget it from the queue.
if updateErr == nil && getNumFailures(service) >= sc.maxRetries {
Expand Down