Skip to content

[release-4.22] OCPBUGS-89236: Handle CA bundle aggregation delay by requeuing revocation #8746

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
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
+87 −10
Open

[release-4.22] OCPBUGS-89236: Handle CA bundle aggregation delay by requeuing revocation #8746

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
4 changes: 2 additions & 2 deletions ...rol-plane-pki-operator/certificaterevocationcontroller/certificaterevocationcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ func (c *CertificateRevocationController) ensureNewSignerCertificatePropagated(c
// that, though, and it's always valid to first check that our certificates have propagated as far
// as we can tell in the system before asking the KAS, since that's expensive
if len(trustedCertificates(totalClientTrustBundle, []*certificateSecret{{cert: signers[0]}}, now)) == 0 {
return true, nil, false, nil
return true, nil, true, nil
}

// if the updated trust bundle has propagated as far as we can tell, let's go ahead and ask
Expand Down Expand Up @@ -1033,7 +1033,7 @@ func (c *CertificateRevocationController) ensureOldSignerCertificateRevoked(ctx
// that, though, and it's always valid to first check that our certificates have propagated as far
// as we can tell in the system before asking the KAS, since that's expensive
if len(trustedCertificates(totalClientTrustBundle, []*certificateSecret{{cert: oldCerts[0]}}, now)) != 0 {
return true, nil, false, nil
return true, nil, true, nil
}

// if the updated trust bundle has propagated as far as we can tell, let's go ahead and ask
Expand Down
93 changes: 85 additions & 8 deletions ...lane-pki-operator/certificaterevocationcontroller/certificaterevocationcontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,11 @@ func TestCertificateRevocationController_processCertificateRevocationRequest(t *
},
},
{
name: "not yet propagated, nothing to do",
now: postRevocationClock.Now,
crrNamespace: "crr-ns",
crrName: "crr-name",
name: "not yet propagated, nothing to do",
now: postRevocationClock.Now,
crrNamespace: "crr-ns",
crrName: "crr-name",
expectedRequeue: true, // New cert not yet in total bundle, requeue to wait for TargetConfigController
crr: &certificatesv1alpha1.CertificateRevocationRequest{
ObjectMeta: metav1.ObjectMeta{Namespace: "crr-ns", Name: "crr-name"},
Spec: certificatesv1alpha1.CertificateRevocationRequestSpec{SignerClass: string(certificates.CustomerBreakGlassSigner)},
Expand Down Expand Up @@ -847,10 +848,11 @@ func TestCertificateRevocationController_processCertificateRevocationRequest(t *
},
},
{
name: "validating, previous still valid",
now: postRevocationClock.Now,
crrNamespace: "crr-ns",
crrName: "crr-name",
name: "validating, previous still valid",
now: postRevocationClock.Now,
crrNamespace: "crr-ns",
crrName: "crr-name",
expectedRequeue: true, // Old cert still in total bundle, requeue to wait for TargetConfigController
crr: &certificatesv1alpha1.CertificateRevocationRequest{
ObjectMeta: metav1.ObjectMeta{Namespace: "crr-ns", Name: "crr-name"},
Spec: certificatesv1alpha1.CertificateRevocationRequestSpec{SignerClass: string(certificates.CustomerBreakGlassSigner)},
Expand Down Expand Up @@ -1033,6 +1035,81 @@ func TestCertificateRevocationController_processCertificateRevocationRequest(t *
},
},
},
{
name: "SRE signer: validating, previous still valid (requeue path)",
now: postRevocationClock.Now,
crrNamespace: "crr-ns",
crrName: "crr-name-sre",
expectedRequeue: true, // Old cert still in total bundle for SRE signer, must requeue
crr: &certificatesv1alpha1.CertificateRevocationRequest{
ObjectMeta: metav1.ObjectMeta{Namespace: "crr-ns", Name: "crr-name-sre"},
Spec: certificatesv1alpha1.CertificateRevocationRequestSpec{SignerClass: string(certificates.SREBreakGlassSigner)},
Status: certificatesv1alpha1.CertificateRevocationRequestStatus{
RevocationTimestamp: ptr.To(metav1.NewTime(revocationClock.Now())),
PreviousSigner: &corev1.LocalObjectReference{Name: "1pfcydcz358pa1glirkmc72sdkf5zw21uam4jbnj03pw"},
Conditions: []metav1.Condition{{
Type: certificatesv1alpha1.LeafCertificatesRegeneratedType,
Status: metav1.ConditionTrue,
LastTransitionTime: metav1.NewTime(postRevocationClock.Now()),
Reason: hypershiftv1beta1.AsExpectedReason,
Message: `All leaf certificates are re-generated.`,
}, {
Type: certificatesv1alpha1.RootCertificatesRegeneratedType,
Status: metav1.ConditionTrue,
LastTransitionTime: metav1.NewTime(postRevocationClock.Now()),
Reason: hypershiftv1beta1.AsExpectedReason,
Message: `Signer certificate crr-ns/sre-system-admin-signer regenerated.`,
}, {
Type: certificatesv1alpha1.NewCertificatesTrustedType,
Status: metav1.ConditionTrue,
LastTransitionTime: metav1.NewTime(postRevocationClock.Now()),
Reason: hypershiftv1beta1.AsExpectedReason,
Message: `New signer certificate crr-ns/sre-system-admin-signer trusted.`,
}},
},
},
secrets: []*corev1.Secret{{
ObjectMeta: metav1.ObjectMeta{
Namespace: "crr-ns",
Name: manifests.SRESystemAdminSigner("").Name,
Annotations: map[string]string{certrotation.CertificateIssuer: "crr-ns_sre-break-glass-signer@1234"},
},
Data: map[string][]byte{
corev1.TLSCertKey: data.future.raw.signerCert,
corev1.TLSPrivateKeyKey: data.future.raw.signerKey,
},
}, {
ObjectMeta: metav1.ObjectMeta{
Namespace: "crr-ns",
Name: "1pfcydcz358pa1glirkmc72sdkf5zw21uam4jbnj03pw",
},
Data: map[string][]byte{
corev1.TLSCertKey: data.original.raw.signerCert,
corev1.TLSPrivateKeyKey: data.original.raw.signerKey,
},
}, {
ObjectMeta: metav1.ObjectMeta{
Namespace: "crr-ns",
Name: manifests.SRESystemAdminClientCertSecret("").Name,
Annotations: map[string]string{certrotation.CertificateIssuer: "crr-ns_sre-break-glass-signer@1234"},
},
Data: map[string][]byte{
corev1.TLSCertKey: data.future.raw.signedCert,
corev1.TLSPrivateKeyKey: data.future.raw.clientKey,
},
}},
cms: []*corev1.ConfigMap{{
ObjectMeta: metav1.ObjectMeta{Namespace: "crr-ns", Name: manifests.SRESystemAdminSignerCA("").Name},
Data: map[string]string{
"ca-bundle.crt": string(data.future.raw.signerCert),
},
}, {
ObjectMeta: metav1.ObjectMeta{Namespace: "crr-ns", Name: manifests.TotalKASClientCABundle("").Name},
Data: map[string]string{
"ca-bundle.crt": string(data.original.raw.signerCert) + string(data.future.raw.signerCert),
},
}},
},
} {
t.Run(testCase.name, func(t *testing.T) {
c := &CertificateRevocationController{
Expand Down
Loading