Skip to content

[release-4.20] OCPBUGS-62057: certrotation: exit when received cabundle is empty #2022

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
wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
+490 −1
Open

[release-4.20] OCPBUGS-62057: certrotation: exit when received cabundle is empty #2022

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
10 changes: 9 additions & 1 deletion pkg/operator/certrotation/client_cert_rotation_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,22 @@ func (c CertRotationController) getSigningCertKeyPairLocation() string {

func (c CertRotationController) SyncWorker(ctx context.Context) error {
signingCertKeyPair, _, err := c.RotatedSigningCASecret.EnsureSigningCertKeyPair(ctx)
if err != nil || signingCertKeyPair == nil {
if err != nil {
return err
}
// If no signingCertKeyPair returned due to update conflict or otherwise, return an error
if signingCertKeyPair == nil {
return fmt.Errorf("signingCertKeyPair is nil")
}

cabundleCerts, err := c.CABundleConfigMap.EnsureConfigMapCABundle(ctx, signingCertKeyPair, c.getSigningCertKeyPairLocation())
if err != nil {
return err
}
// If no ca bundle returned due to update conflict or otherwise, return an error
if cabundleCerts == nil {
return fmt.Errorf("cabundleCerts is nil")
}

if _, err := c.RotatedSelfSignedCertKeySecret.EnsureTargetCertKeyPair(ctx, signingCertKeyPair, cabundleCerts); err != nil {
return err
Expand Down
Loading