From 82731043933762760a7549c35643fded3b52695d Mon Sep 17 00:00:00 2001 From: Mengqi Yu Date: Wed, 9 Jan 2019 14:01:02 -0800 Subject: [PATCH] :bug: gen cert for the server even there are no webhooks --- pkg/webhook/internal/cert/provisioner.go | 4 ---- pkg/webhook/internal/cert/provisioner_test.go | 15 +++++++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkg/webhook/internal/cert/provisioner.go b/pkg/webhook/internal/cert/provisioner.go index d7463f78dd..992e9da939 100644 --- a/pkg/webhook/internal/cert/provisioner.go +++ b/pkg/webhook/internal/cert/provisioner.go @@ -56,10 +56,6 @@ func (cp *Provisioner) Provision(options Options) (bool, error) { if cp.CertWriter == nil { return false, errors.New("CertWriter need to be set") } - // If the objects need to be updated, just be lazy and return. - if len(options.Objects) == 0 { - return false, nil - } dnsName, err := dnsNameFromClientConfig(options.ClientConfig) if err != nil { diff --git a/pkg/webhook/internal/cert/provisioner_test.go b/pkg/webhook/internal/cert/provisioner_test.go index 4904cf6bc0..4b9bfa6b85 100644 --- a/pkg/webhook/internal/cert/provisioner_test.go +++ b/pkg/webhook/internal/cert/provisioner_test.go @@ -40,11 +40,18 @@ var _ = Describe("provisioner", func() { It("should return no error", func() { fcw := &fakeCertWriter{} p := Provisioner{CertWriter: fcw} - changed, err := p.Provision(Options{}) + changed, err := p.Provision(Options{ + ClientConfig: &admissionregistrationv1beta1.WebhookClientConfig{ + Service: &admissionregistrationv1beta1.ServiceReference{ + Namespace: "test-svc-namespace", + Name: "test-service", + }, + }, + }) Expect(err).NotTo(HaveOccurred()) - Expect(changed).To(BeFalse()) - Expect(fcw.invokedEnsureCert).To(BeFalse()) - Expect(fcw.invokedInject).To(BeFalse()) + Expect(changed).To(BeTrue()) + Expect(fcw.invokedEnsureCert).To(BeTrue()) + Expect(fcw.invokedInject).To(BeTrue()) }) })