From 50757e62ddf3b6b334681858d2386cab499822e9 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 28 Oct 2019 17:15:49 +0100
Subject: [PATCH] add forgotten helmfile config, add `--validate=false` to
 kubernetes manifests (https://github.com/jetstack/cert-manager/issues/2208)

---
 ansible/roles/apps/tasks/cert-manager.yml | 3 ++-
 helmfiles/helmfile.d/05-cert-manager.yaml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/apps/tasks/cert-manager.yml b/ansible/roles/apps/tasks/cert-manager.yml
index ef149e099..bdb1feb7f 100644
--- a/ansible/roles/apps/tasks/cert-manager.yml
+++ b/ansible/roles/apps/tasks/cert-manager.yml
@@ -2,7 +2,8 @@
 - name: Install CRDs for cert-manager
   tags:
     - cert-manager
-  command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/jetstack/cert-manager/v{{ cert_manager.crd_version }}/deploy/manifests/00-crds.yaml'
+  # TODO: Remove `--validate=false` once we use Kubernetes 1.16 or above
+  command: '/snap/bin/kubectl apply --validate=false -f https://raw.githubusercontent.com/jetstack/cert-manager/v{{ cert_manager.crd_version }}/deploy/manifests/00-crds.yaml'
 
 - name: Prevent validation deadlock for cert-manager
   tags:
diff --git a/helmfiles/helmfile.d/05-cert-manager.yaml b/helmfiles/helmfile.d/05-cert-manager.yaml
index 6b75e33e9..94eb17daa 100644
--- a/helmfiles/helmfile.d/05-cert-manager.yaml
+++ b/helmfiles/helmfile.d/05-cert-manager.yaml
@@ -11,7 +11,7 @@ releases:
   - name: "oas-{{ .Environment.Values.releaseName }}-cert-manager"
     namespace: "cert-manager"
     chart: "jetstack/cert-manager"
-    version: "0.9.1"
+    version: "0.11.0"
     values:
     - "../values/cert-manager.yaml.gotmpl"
     wait: false
-- 
GitLab