Upgrade JetStack Cert-Manager to v0.15.2

kubernetes-sigs · Jul 16, 2020 · 28197d5 · 28197d5
1 parent bda8a24
commit 28197d5
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 41 deletions.
diff --git a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-certificate.yml.j2 b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-certificate.yml.j2
@@ -5,18 +5,14 @@ metadata:
   name: certificates.certmanager.k8s.io
   annotations:
     "helm.sh/hook": crd-install
-<<<<<<< HEAD
     "api-approved.kubernetes.io": "unapproved-will-be-remove-with-cert-manager-update"
-=======
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2
   labels:
     app: cert-manager
     chart: cert-manager-v0.5.2
     release: cert-manager
     heritage: Tiller
 spec:
   group: certmanager.k8s.io
-<<<<<<< HEAD
   scope: Namespaced
   versions:
   - name: v1alpha1
@@ -715,18 +711,3 @@ spec:
                   issuance by checking if the revision value in the annotation is
                   greater than this field."
                 type: integer
-=======
-  version: v1alpha1
-  scope: Namespaced
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2
-  names:
-    kind: Certificate
-    plural: certificates
-    shortNames:
-      - cert
-      - certs
-<<<<<<< HEAD
-
-=======
-
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2
diff --git a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-clusterissuer.yml.j2 b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-clusterissuer.yml.j2
@@ -5,18 +5,14 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   annotations:
     "helm.sh/hook": crd-install
-<<<<<<< HEAD
     "api-approved.kubernetes.io": "unapproved-will-be-remove-with-cert-manager-update"
-=======
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2
   labels:
     app: cert-manager
     chart: cert-manager-v0.5.2
     release: cert-manager
     heritage: Tiller
 spec:
   group: certmanager.k8s.io
-<<<<<<< HEAD
   scope: Cluster
   names:
     kind: ClusterIssuer
@@ -1776,10 +1772,3 @@ spec:
                       type:
                         description: Type of the condition, currently ('Ready').
                         type: string
-=======
-  version: v1alpha1
-  names:
-    kind: ClusterIssuer
-    plural: clusterissuers
-  scope: Cluster
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2
diff --git a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-issuer.yml.j2 b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-issuer.yml.j2
@@ -5,18 +5,14 @@ metadata:
   name: issuers.certmanager.k8s.io
   annotations:
     "helm.sh/hook": crd-install
-<<<<<<< HEAD
     "api-approved.kubernetes.io": "unapproved-will-be-remove-with-cert-manager-update"
-=======
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2
   labels:
     app: cert-manager
     chart: cert-manager-v0.5.2
     release: cert-manager
     heritage: Tiller
 spec:
   group: certmanager.k8s.io
-<<<<<<< HEAD
   scope: Namespaced
   names:
     kind: Issuer
@@ -1776,10 +1772,3 @@ spec:
                       type:
                         description: Type of the condition, currently ('Ready').
                         type: string
-=======
-  version: v1alpha1
-  names:
-    kind: Issuer
-    plural: issuers
-  scope: Namespaced
->>>>>>> parent of 32c3f0f5... Upgrade JetStack Cert-Manager to v0.15.2