From 719dd915d1918d68c5e82bf72f91f32ba534f454 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Wed, 7 Nov 2018 16:02:03 +0000 Subject: [PATCH] Re-enable webhook during e2e tests and fix panic on start Signed-off-by: James Munnelly --- cmd/webhook/main.go | 4 ---- test/fixtures/cert-manager-values.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index c39203e21..c763a44ce 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -22,7 +22,6 @@ import ( "github.com/openshift/generic-admission-server/pkg/cmd" "github.com/jetstack/cert-manager/pkg/apis/certmanager/validation/webhooks" - "github.com/jetstack/cert-manager/pkg/logs" ) var certHook cmd.ValidatingAdmissionHook = &webhooks.CertificateAdmissionHook{} @@ -30,9 +29,6 @@ var issuerHook cmd.ValidatingAdmissionHook = &webhooks.IssuerAdmissionHook{} var clusterIssuerHook cmd.ValidatingAdmissionHook = &webhooks.ClusterIssuerAdmissionHook{} func main() { - logs.InitLogs() - defer logs.FlushLogs() - // Avoid "logging before flag.Parse" errors from glog flag.CommandLine.Parse([]string{}) diff --git a/test/fixtures/cert-manager-values.yaml b/test/fixtures/cert-manager-values.yaml index a44719c27..c3f0773d4 100644 --- a/test/fixtures/cert-manager-values.yaml +++ b/test/fixtures/cert-manager-values.yaml @@ -19,10 +19,10 @@ extraArgs: - --leader-election-retry-period=2s webhook: - # enabled: true - # image: - # tag: build - # pullPolicy: Never + enabled: true + image: + tag: build + pullPolicy: Never resources: requests: cpu: 10m