From 9bccb530b8bda55c666cb04f9bc176b29f254fa7 Mon Sep 17 00:00:00 2001
From: Dmitry Makovey <dmakovey@gitlab.com>
Date: Mon, 17 May 2021 15:11:00 -0600
Subject: [PATCH] Add fixes

---
 support/crd.yaml               |  4 ++++
 templates/cert-manager-crd.yml | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/support/crd.yaml b/support/crd.yaml
index 48d6bf9fc7..969c8875de 100644
--- a/support/crd.yaml
+++ b/support/crd.yaml
@@ -1,4 +1,8 @@
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
 kind: CustomResourceDefinition
 metadata:
   name: gitlabs.gitlab.com
diff --git a/templates/cert-manager-crd.yml b/templates/cert-manager-crd.yml
index 961f01b326..1ea96b47a8 100644
--- a/templates/cert-manager-crd.yml
+++ b/templates/cert-manager-crd.yml
@@ -1,6 +1,10 @@
 {{ if and .Values.certmanager.install .Values.certmanager.createCustomResource }}
 ---
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
@@ -187,7 +191,11 @@ status:
 ---
 
 ---
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
@@ -483,7 +491,11 @@ status:
 ---
 
 ---
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
@@ -1896,7 +1908,12 @@ status:
 ---
 
 ---
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
+
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
@@ -3871,7 +3888,12 @@ status:
 ---
 
 ---
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
+
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
@@ -5846,7 +5868,11 @@ status:
 ---
 
 ---
+{{ if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
 apiVersion: apiextensions.k8s.io/v1beta1
+{{ else }}
+apiVersion: apiextensions.k8s.io/v1
+{{ end }}
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-- 
GitLab