From 380bd9257b258975cb58a3052c12409c19e80e44 Mon Sep 17 00:00:00 2001 From: Brandon Wilson Date: Tue, 26 Nov 2019 21:10:05 -0600 Subject: [PATCH] kata-deploy: reorganize files to support kustomize Signed-off-by: Brandon Wilson --- kata-deploy/README.md | 4 ++-- kata-deploy/{ => kata-cleanup/base}/kata-cleanup.yaml | 0 kata-deploy/kata-cleanup/base/kustomization.yaml | 2 ++ kata-deploy/{ => kata-deploy/base}/kata-deploy.yaml | 0 kata-deploy/kata-deploy/base/kustomization.yaml | 2 ++ kata-deploy/{ => kata-rbac/base}/kata-rbac.yaml | 0 kata-deploy/kata-rbac/base/kustomization.yaml | 2 ++ 7 files changed, 8 insertions(+), 2 deletions(-) rename kata-deploy/{ => kata-cleanup/base}/kata-cleanup.yaml (100%) create mode 100644 kata-deploy/kata-cleanup/base/kustomization.yaml rename kata-deploy/{ => kata-deploy/base}/kata-deploy.yaml (100%) create mode 100644 kata-deploy/kata-deploy/base/kustomization.yaml rename kata-deploy/{ => kata-rbac/base}/kata-rbac.yaml (100%) create mode 100644 kata-deploy/kata-rbac/base/kustomization.yaml diff --git a/kata-deploy/README.md b/kata-deploy/README.md index a1eea8532..18b1bedd5 100644 --- a/kata-deploy/README.md +++ b/kata-deploy/README.md @@ -71,8 +71,8 @@ After completing, the original `daemon.json`, if it existed, is restored and all ### Install Kata on a running Kubernetes cluster ```sh -$ kubectl apply -f kata-rbac.yaml -$ kubectl apply -f kata-deploy.yaml +$ kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/kata-rbac/base/kata-rbac.yaml +$ kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/kata-deploy/base/kata-deploy.yaml ``` ### Run a sample workload diff --git a/kata-deploy/kata-cleanup.yaml b/kata-deploy/kata-cleanup/base/kata-cleanup.yaml similarity index 100% rename from kata-deploy/kata-cleanup.yaml rename to kata-deploy/kata-cleanup/base/kata-cleanup.yaml diff --git a/kata-deploy/kata-cleanup/base/kustomization.yaml b/kata-deploy/kata-cleanup/base/kustomization.yaml new file mode 100644 index 000000000..6c548a044 --- /dev/null +++ b/kata-deploy/kata-cleanup/base/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- kata-cleanup.yaml diff --git a/kata-deploy/kata-deploy.yaml b/kata-deploy/kata-deploy/base/kata-deploy.yaml similarity index 100% rename from kata-deploy/kata-deploy.yaml rename to kata-deploy/kata-deploy/base/kata-deploy.yaml diff --git a/kata-deploy/kata-deploy/base/kustomization.yaml b/kata-deploy/kata-deploy/base/kustomization.yaml new file mode 100644 index 000000000..6b6d8e4cf --- /dev/null +++ b/kata-deploy/kata-deploy/base/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- kata-deploy.yaml diff --git a/kata-deploy/kata-rbac.yaml b/kata-deploy/kata-rbac/base/kata-rbac.yaml similarity index 100% rename from kata-deploy/kata-rbac.yaml rename to kata-deploy/kata-rbac/base/kata-rbac.yaml diff --git a/kata-deploy/kata-rbac/base/kustomization.yaml b/kata-deploy/kata-rbac/base/kustomization.yaml new file mode 100644 index 000000000..a79f10e85 --- /dev/null +++ b/kata-deploy/kata-rbac/base/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- kata-rbac.yaml