From c4a794d163fbd2a9f5dcb26ed8b251b75a6c26c8 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Thu, 10 Jan 2019 16:54:45 +0000
Subject: [PATCH] Include CRD and Namespace resources in static deployment
 manifest file

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 deploy/manifests/00-crds.yaml      |  9 ---
 deploy/manifests/01-namespace.yaml |  8 +++
 deploy/manifests/cert-manager.yaml | 90 ++++++++++++++++++++++++++++++
 hack/update-deploy-gen.sh          |  7 ++-
 4 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 deploy/manifests/01-namespace.yaml

diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml
index af8887580..95dae6825 100644
--- a/deploy/manifests/00-crds.yaml
+++ b/deploy/manifests/00-crds.yaml
@@ -1,12 +1,3 @@
-## THIS FILE IS MANUALLY WRITTEN AND NOT AUTOMATICALLY GENERATED
-##
-## You should install this file with "kubectl apply -f" before installing the
-## cert-manager Helm chart or applying the "deploy/manifests/cert-manager.yaml"
-## file.
-##
-
----
-
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/deploy/manifests/01-namespace.yaml b/deploy/manifests/01-namespace.yaml
new file mode 100644
index 000000000..8148424bf
--- /dev/null
+++ b/deploy/manifests/01-namespace.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+  labels:
+    certmanager.k8s.io/disable-validation: "true"
+
+---
diff --git a/deploy/manifests/cert-manager.yaml b/deploy/manifests/cert-manager.yaml
index 0aecc4f5b..91bc52fc0 100644
--- a/deploy/manifests/cert-manager.yaml
+++ b/deploy/manifests/cert-manager.yaml
@@ -1,3 +1,93 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: certificates.certmanager.k8s.io
+  labels:
+    app: cert-manager
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  scope: Namespaced
+  names:
+    kind: Certificate
+    plural: certificates
+    shortNames:
+    - cert
+    - certs
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: issuers.certmanager.k8s.io
+  labels:
+    app: cert-manager
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Issuer
+    plural: issuers
+  scope: Namespaced
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterissuers.certmanager.k8s.io
+  labels:
+    app: cert-manager
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: ClusterIssuer
+    plural: clusterissuers
+  scope: Cluster
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: orders.certmanager.k8s.io
+  labels:
+    app: cert-manager
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Order
+    plural: orders
+  scope: Namespaced
+
+---
+
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: challenges.certmanager.k8s.io
+  labels:
+    app: cert-manager
+spec:
+  group: certmanager.k8s.io
+  version: v1alpha1
+  names:
+    kind: Challenge
+    plural: challenges
+  scope: Namespaced
+
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+  labels:
+    certmanager.k8s.io/disable-validation: "true"
+
+---
 ---
 # Source: cert-manager/charts/webhook/templates/serviceaccount.yaml
 apiVersion: v1
diff --git a/hack/update-deploy-gen.sh b/hack/update-deploy-gen.sh
index 1cf54010c..fe52773b7 100755
--- a/hack/update-deploy-gen.sh
+++ b/hack/update-deploy-gen.sh
@@ -36,9 +36,10 @@ gen() {
 		--values "${REPO_ROOT}/deploy/manifests/helm-values.yaml" \
 		--kube-version "${KUBE_VERSION}" \
 		--namespace "cert-manager" \
-		--name "cert-manager" \
-		--set "createNamespaceResource=true" > "${TMP_OUTPUT}"
-	mv "${TMP_OUTPUT}" "${OUTPUT}"
+		--name "cert-manager" > "${TMP_OUTPUT}"
+    cat "${REPO_ROOT}/deploy/manifests/00-crds.yaml" \
+        "${REPO_ROOT}/deploy/manifests/01-namespace.yaml" \
+        "${TMP_OUTPUT}" > "${OUTPUT}"
 }
 
 export HELM_HOME="$(mktemp -d)"