From f53a89646fc1660533858718a0a2419e28cf3487 Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano@smallstep.com>
Date: Tue, 13 Aug 2019 18:27:19 -0700
Subject: [PATCH] Adapt kustomization.yaml to version 3

---
 config/crd/kustomization.yaml     | 2 +-
 config/default/kustomization.yaml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 066a1ac..3779e35 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -5,7 +5,7 @@ resources:
 - bases/certmanager.step.sm_stepissuers.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patches:
+patchesStrategicMerge:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- patches/webhook_in_stepissuers.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 6137fad..c7403c6 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 # Adds namespace to all resources.
 namespace: step-issuer-system
 
@@ -12,7 +15,7 @@ namePrefix: step-issuer-
 #commonLabels:
 #  someName: someValue
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager
@@ -21,7 +24,7 @@ bases:
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
 #- ../certmanager
 
-patches:
+patchesStrategicMerge:
 - manager_image_patch.yaml
   # Protect the /metrics endpoint by putting it behind auth.
   # Only one of manager_auth_proxy_patch.yaml and
-- 
GitLab