Merge pull request #1052 from munnerz/webhook-panic

Re-enable webhook during e2e tests and fix panic on start
cert-manager · Nov 7, 2018 · 25c1c12 · 25c1c12
2 parents 814a1d7 + 17c5a2e
commit 25c1c12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/cmd/webhook/BUILD.bazel b/cmd/webhook/BUILD.bazel
@@ -14,7 +14,6 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "//pkg/apis/certmanager/validation/webhooks:go_default_library",
-        "//pkg/logs:go_default_library",
         "//vendor/github.com/openshift/generic-admission-server/pkg/cmd:go_default_library",
     ],
 )

diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -22,17 +22,13 @@ 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{}
 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/e2e/framework/helper/pod_start.go b/test/e2e/framework/helper/pod_start.go
@@ -63,6 +63,10 @@ func (h *Helper) WaitForAllPodsRunningInNamespaceTimeout(ns string, timeout time
 				errs = append(errs, fmt.Sprintf("Pod %q not ready (no Ready condition)", p.Name))
 				continue
 			}
+			if c.Reason == "PodCompleted" {
+				Logf("Pod %q has Completed, assuming it is ready/expected", p.Name)
+				continue
+			}
 			// This pod does not have the ready condition set to True
 			if c.Status != corev1.ConditionTrue {
 				errs = append(errs, fmt.Sprintf("Pod %q not ready: %s", p.Name, c.String()))

diff --git 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