kustomization support (hjacobs#72)

KohlsTechnology · Apr 25, 2020 · 64cdba6 · 64cdba6
1 parent 06c8f77
commit 64cdba6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 48 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
     rev: 0.2.0
     hooks:
       - id: kube-manifest-lint
-        exclude: ^helm/templates/.*$
+        exclude: ^helm/templates/.*$|kustomization.yaml
 
   - repo: https://github.com/ambv/black
     rev: 19.10b0

diff --git a/README.rst b/README.rst
@@ -46,12 +46,11 @@ Usage
 
 Deploy the janitor into your cluster via (also works with Minikube_):
 
-    Warning: if you want to deploy janitor to namespace other than ``default``, you need to edit ``/deploy/common/rbac.yaml`` first.
+    Warning: if you want to deploy janitor to namespace other than ``default``, you need to edit ``/deploy/rbac.yaml`` first.
 
 .. code-block:: bash
 
-    $ kubectl apply -f deploy/common/
-    $ kubectl apply -f deploy/deployment/
+    $ kubectl apply -f deploy/
 
 The example configuration uses the ``--dry-run`` as a safety flag to prevent any deletion --- remove it to enable the janitor, e.g. by editing the deployment:
 

diff --git a/deploy/cronjob/cronjob.yaml b/deploy/cronjob/cronjob.yaml
diff --git a/deploy/deployment/deployment.yaml → deploy/deployment.yaml b/deploy/deployment/deployment.yaml → deploy/deployment.yaml
diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - deployment.yaml
+  - rbac.yaml
+  - rules-config.yaml
diff --git a/deploy/common/rbac.yaml → deploy/rbac.yaml b/deploy/common/rbac.yaml → deploy/rbac.yaml
diff --git a/deploy/common/rules-config.yaml → deploy/rules-config.yaml b/deploy/common/rules-config.yaml → deploy/rules-config.yaml