From 1caf4d67efc9ac4c6fb1a362eb944e2079264255 Mon Sep 17 00:00:00 2001
From: James Munnelly <james.munnelly@jetstack.io>
Date: Fri, 1 Dec 2017 19:44:33 +0000
Subject: [PATCH] Fix cluster issuer tests. Add hostNetwork option. Turn up log
 level.

---
 contrib/charts/cert-manager/templates/deployment.yaml | 5 +++++
 contrib/charts/cert-manager/values.yaml               | 6 ++++++
 test/e2e/clusterissuer/clusterissuer_ca.go            | 6 ++++--
 test/fixtures/cert-manager-values.yaml                | 7 +++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/contrib/charts/cert-manager/templates/deployment.yaml
index bb250a18d..ed154a306 100644
--- a/contrib/charts/cert-manager/templates/deployment.yaml
+++ b/contrib/charts/cert-manager/templates/deployment.yaml
@@ -15,12 +15,17 @@ spec:
         app: {{ template "name" . }}
         release: {{ .Release.Name }}
     spec:
+      hostNetwork: {{ .Values.hostNetwork | default false }}
       serviceAccount: {{ template "fullname" . }}
       serviceAccountName: {{ template "fullname" . }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args:
+{{- range .Values.extraArgs }}
+          - {{ . }}
+{{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
 {{- if .Values.ingressShim.enabled }}
diff --git a/contrib/charts/cert-manager/values.yaml b/contrib/charts/cert-manager/values.yaml
index 880813f84..8c4cf041b 100644
--- a/contrib/charts/cert-manager/values.yaml
+++ b/contrib/charts/cert-manager/values.yaml
@@ -18,6 +18,9 @@ resources:
     cpu: 10m
     memory: 32Mi
 
+# Optional additional arguments for cert-manager
+extraArgs: []
+
 ingressShim:
   enabled: true
   # Optional additional arguments for ingress-shim
@@ -32,3 +35,6 @@ ingressShim:
     # You should only change this if you know what you are doing!
     # tag: v0.2.1
     pullPolicy: Always
+
+## Used for e2e testing
+# hostNetwork: false
diff --git a/test/e2e/clusterissuer/clusterissuer_ca.go b/test/e2e/clusterissuer/clusterissuer_ca.go
index b3114dffb..a67538a78 100644
--- a/test/e2e/clusterissuer/clusterissuer_ca.go
+++ b/test/e2e/clusterissuer/clusterissuer_ca.go
@@ -22,6 +22,8 @@ import (
 	"github.com/jetstack/cert-manager/test/util"
 )
 
+const clusterResourceNamespace = "kube-system"
+
 var _ = framework.CertManagerDescribe("CA ClusterIssuer", func() {
 	f := framework.NewDefaultFramework("create-ca-clusterissuer")
 
@@ -30,13 +32,13 @@ var _ = framework.CertManagerDescribe("CA ClusterIssuer", func() {
 
 	BeforeEach(func() {
 		By("Creating a signing keypair fixture")
-		_, err := f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name).Create(util.NewSigningKeypairSecret(secretName))
+		_, err := f.KubeClientSet.CoreV1().Secrets(clusterResourceNamespace).Create(util.NewSigningKeypairSecret(secretName))
 		Expect(err).NotTo(HaveOccurred())
 	})
 
 	AfterEach(func() {
 		By("Cleaning up")
-		f.KubeClientSet.CoreV1().Secrets(f.Namespace.Name).Delete(secretName, nil)
+		f.KubeClientSet.CoreV1().Secrets(clusterResourceNamespace).Delete(secretName, nil)
 	})
 
 	It("should validate a signing keypair", func() {
diff --git a/test/fixtures/cert-manager-values.yaml b/test/fixtures/cert-manager-values.yaml
index 24bdfe8ff..b8f555f10 100644
--- a/test/fixtures/cert-manager-values.yaml
+++ b/test/fixtures/cert-manager-values.yaml
@@ -4,7 +4,14 @@ image:
   tag: build
   pullPolicy: Never
 
+extraArgs:
+- --v=8
+
 ingressShim:
+  extraArgs:
+  - --v=8
   image:
     tag: build
     pullPolicy: Never
+
+hostNetwork: true