From 1b4c259a0c85a2ef41bf525e68190c24fcadeb1c Mon Sep 17 00:00:00 2001 From: Nicolas Trangez Date: Thu, 17 Dec 2020 23:42:24 +0000 Subject: [PATCH] deploy: use `crds` Kustomization from the API repo Instead of listing all CRD manifests and patching in the required `api-approved` label in a Kustomization within this repository, use the new Kustomization layer from the API repository as a base. This simplifies the deployment machinery in this project. See: https://github.com/kubernetes-sigs/container-object-storage-interface-api/pull/13 --- .../deploy/base/kustomization.yaml | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/container-object-storage-interface-controller/deploy/base/kustomization.yaml b/container-object-storage-interface-controller/deploy/base/kustomization.yaml index 1d7e8e55..100cd953 100644 --- a/container-object-storage-interface-controller/deploy/base/kustomization.yaml +++ b/container-object-storage-interface-controller/deploy/base/kustomization.yaml @@ -2,26 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -resources: +bases: # CRDs -- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketaccessclasses.yaml -- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketaccesses.yaml -- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketaccessrequests.yaml -- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketclasses.yaml -- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_bucketrequests.yaml -- https://raw.githubusercontent.com/kubernetes-sigs/container-object-storage-interface-api/master/crds/objectstorage.k8s.io_buckets.yaml +- github.com/kubernetes-sigs/container-object-storage-interface-api/crds + +resources: # Controller - sa.yaml - rbac.yaml - deployment.yaml - -patches: -# CRDs -- target: - kind: CustomResourceDefinition - patch: |- - - op: add - path: /metadata/annotations - value: - controller-gen.kubebuilder.io/version: (devel) - api-approved.kubernetes.io: https://github.com/kubernetes-sigs/container-object-storage-interface-api/pull/2