From ce73a22f6f350a9903fa081189f36c32178007df Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 22 Feb 2018 07:24:29 +0000 Subject: [PATCH 1/2] Set default cluster resource namespace to current pod namespace --- contrib/charts/cert-manager/templates/deployment.yaml | 8 +++++++- docs/deploy/rbac/deployment.yaml | 7 +++++++ docs/deploy/without-rbac/deployment.yaml | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/contrib/charts/cert-manager/templates/deployment.yaml index f4d10d598..97030e432 100644 --- a/contrib/charts/cert-manager/templates/deployment.yaml +++ b/contrib/charts/cert-manager/templates/deployment.yaml @@ -20,10 +20,16 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- if .Values.extraArgs }} args: + - --cluster-resource-namespace=$(POD_NAMESPACE) + {{- if .Values.extraArgs }} {{ toYaml .Values.extraArgs | indent 12 }} {{- end }} + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.ingressShim.enabled }} diff --git a/docs/deploy/rbac/deployment.yaml b/docs/deploy/rbac/deployment.yaml index 1748dd55d..c6195335a 100644 --- a/docs/deploy/rbac/deployment.yaml +++ b/docs/deploy/rbac/deployment.yaml @@ -22,6 +22,13 @@ spec: - name: cert-manager image: "quay.io/jetstack/cert-manager-controller:v0.2.3" imagePullPolicy: IfNotPresent + args: + - --cluster-resource-namespace=$(POD_NAMESPACE) + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace resources: requests: cpu: 10m diff --git a/docs/deploy/without-rbac/deployment.yaml b/docs/deploy/without-rbac/deployment.yaml index bc15442dd..1ee62ca7f 100644 --- a/docs/deploy/without-rbac/deployment.yaml +++ b/docs/deploy/without-rbac/deployment.yaml @@ -22,6 +22,13 @@ spec: - name: cert-manager image: "quay.io/jetstack/cert-manager-controller:v0.2.3" imagePullPolicy: IfNotPresent + args: + - --cluster-resource-namespace=$(POD_NAMESPACE) + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace resources: requests: cpu: 10m From 30c28975cb658d98dad5705195d6bcbfeb88eb5a Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 22 Feb 2018 07:38:42 +0000 Subject: [PATCH 2/2] Update cluster resource namespace during e2e tests --- contrib/charts/cert-manager/templates/deployment.yaml | 4 ++-- test/e2e/clusterissuer/clusterissuer_ca.go | 2 +- test/e2e/e2e.go | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/contrib/charts/cert-manager/templates/deployment.yaml index 97030e432..f6b15dca0 100644 --- a/contrib/charts/cert-manager/templates/deployment.yaml +++ b/contrib/charts/cert-manager/templates/deployment.yaml @@ -23,7 +23,7 @@ spec: args: - --cluster-resource-namespace=$(POD_NAMESPACE) {{- if .Values.extraArgs }} -{{ toYaml .Values.extraArgs | indent 12 }} +{{ toYaml .Values.extraArgs | indent 10 }} {{- end }} env: - name: POD_NAMESPACE @@ -38,7 +38,7 @@ spec: imagePullPolicy: {{ .Values.ingressShim.image.pullPolicy }} {{- if .Values.ingressShim.extraArgs }} args: -{{ toYaml .Values.ingressShim.extraArgs | indent 12 }} +{{ toYaml .Values.ingressShim.extraArgs | indent 10 }} {{- end }} resources: {{ toYaml .Values.ingressShim.resources | indent 12 }} diff --git a/test/e2e/clusterissuer/clusterissuer_ca.go b/test/e2e/clusterissuer/clusterissuer_ca.go index 1ee701c6f..5d4918419 100644 --- a/test/e2e/clusterissuer/clusterissuer_ca.go +++ b/test/e2e/clusterissuer/clusterissuer_ca.go @@ -22,7 +22,7 @@ import ( "github.com/jetstack/cert-manager/test/util" ) -const clusterResourceNamespace = "kube-system" +const clusterResourceNamespace = "cert-manager" var _ = framework.CertManagerDescribe("CA ClusterIssuer", func() { f := framework.NewDefaultFramework("create-ca-clusterissuer") diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 9bcd27055..03dfbbb23 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -34,6 +34,8 @@ import ( _ "github.com/jetstack/cert-manager/test/e2e/issuer" ) +const certManagerDeploymentNamespace = "cert-manager" + // TestE2E checks configuration parameters (specified through flags) and then runs // E2E tests using the Ginkgo runner. func RunE2ETests(t *testing.T) { @@ -47,7 +49,7 @@ func RunE2ETests(t *testing.T) { } glog.Infof("Installing cert-manager helm chart") - InstallHelmChart(t, releaseName, "./contrib/charts/cert-manager", "cert-manager", "./test/fixtures/cert-manager-values.yaml") + InstallHelmChart(t, releaseName, "./contrib/charts/cert-manager", certManagerDeploymentNamespace, "./test/fixtures/cert-manager-values.yaml") glog.Infof("Installing boulder chart") // 10 minute timeout for boulder install due to large images