Skip to content

Commit bdfd312

Browse files
authored
[Bugfix] Ignore not owned CAs (#632)
1 parent 3f7b548 commit bdfd312

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

pkg/deployment/reconcile/plan_builder_tls.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ func keyfileRenewalRequired(ctx context.Context,
461461
case *url.Error:
462462
switch v.Err.(type) {
463463
case x509.UnknownAuthorityError, x509.CertificateInvalidError:
464+
log.Warn().Err(v.Err).Str("type", reflect.TypeOf(v.Err).String()).Msg("Validation of server cert failed")
464465
return true, true
465466
default:
466467
log.Warn().Err(v.Err).Str("type", reflect.TypeOf(v.Err).String()).Msg("Validation of server cert failed")
@@ -477,7 +478,12 @@ func keyfileRenewalRequired(ctx context.Context,
477478
continue
478479
}
479480

481+
if ca.Contains(cert) {
482+
continue
483+
}
484+
480485
if time.Now().Add(CertificateRenewalMargin).After(cert.NotAfter) {
486+
log.Warn().Msg("Renewal margin exceeded")
481487
return true, true
482488
}
483489
}
@@ -512,6 +518,7 @@ func keyfileRenewalRequired(ctx context.Context,
512518
keyfileSha := util.SHA256(keyfile)
513519

514520
if tls.Result.KeyFile.GetSHA().Checksum() != keyfileSha {
521+
log.Warn().Str("current", tls.Result.KeyFile.GetSHA().Checksum()).Str("desired", keyfileSha).Msg("Unable to get tls details")
515522
return true, false
516523
}
517524
}

0 commit comments

Comments
 (0)