Skip to content

rotator: ignore CRDs without conversion webhook client config #492

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

rotator: ignore CRDs without conversion webhook client config #492

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
2 changes: 1 addition & 1 deletion pkg/rotator/rotator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ func injectCertToConversionWebhook(crd *unstructured.Unstructured, certPem []byt
return err
}
if !found {
return errors.New("`conversion.webhook.clientConfig` field not found in CustomResourceDefinition")
return nil
}
if err := unstructured.SetNestedField(crd.Object, base64.StdEncoding.EncodeToString(certPem), "spec", "conversion", "webhook", "clientConfig", "caBundle"); err != nil {
return err
Expand Down
22 changes: 22 additions & 0 deletions pkg/rotator/rotator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,28 @@ func TestCertSigning(t *testing.T) {
}
}

func TestInjectCertToConversionWebhookWithoutClientConfig(t *testing.T) {
crd := &unstructured.Unstructured{Object: map[string]interface{}{
"spec": map[string]interface{}{
"conversion": map[string]interface{}{
"strategy": "None",
},
},
}}

if err := injectCertToConversionWebhook(crd, []byte("dummy-cert")); err != nil {
t.Fatalf("injecting certificate should be a no-op when conversion webhook clientConfig is missing: %v", err)
}

_, found, err := unstructured.NestedString(crd.Object, "spec", "conversion", "webhook", "clientConfig", "caBundle")
if err != nil {
t.Fatalf("unexpected error checking conversion webhook caBundle: %v", err)
}
if found {
t.Fatal("caBundle should not be created when conversion webhook clientConfig is missing")
}
}

func TestCertExpiry(t *testing.T) {
caArtifacts, err := cr.CreateCACert(begin, end)
if err != nil {
Expand Down
Loading