From b41eeb2cba5da2470da1c52ec10b09d5743e0a4c Mon Sep 17 00:00:00 2001
From: Fabian Deutsch <fabiand@redhat.com>
Date: Tue, 13 Dec 2016 17:44:54 +0100
Subject: [PATCH] Move manifests to /

The manifests are also an essential building block
thus we keep it on the top-level.

Change-Id: Ib13f679cbf7af86357be4a8276e17c0ea64b2fc8
Signed-off-by: Fabian Deutsch <fabiand@redhat.com>
---
 Makefile                                               | 4 ++--
 cluster/deploy.sh                                      | 4 ++--
 hack/config.sh                                         | 2 +-
 {cluster/manifest => manifest}/haproxy.yaml.in         | 0
 {cluster/manifest => manifest}/virt-api.yaml.in        | 0
 {cluster/manifest => manifest}/virt-controller.yaml.in | 0
 {cluster/manifest => manifest}/virt-handler.yaml.in    | 0
 {cluster/manifest => manifest}/vm-resource.yaml.in     | 0
 8 files changed, 5 insertions(+), 5 deletions(-)
 rename {cluster/manifest => manifest}/haproxy.yaml.in (100%)
 rename {cluster/manifest => manifest}/virt-api.yaml.in (100%)
 rename {cluster/manifest => manifest}/virt-controller.yaml.in (100%)
 rename {cluster/manifest => manifest}/virt-handler.yaml.in (100%)
 rename {cluster/manifest => manifest}/vm-resource.yaml.in (100%)

diff --git a/Makefile b/Makefile
index 6b1af56f575c..f73eddd538a5 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ clean:
 
 distclean: clean
 	find vendor/ -maxdepth 1 -mindepth 1 -not -name vendor.json -exec rm {} -rf \;
-	rm -f ./custer/manifest/*.yaml
+	rm -f manifest/*.yaml
 
 sync:
 	govendor sync
@@ -35,7 +35,7 @@ docker: build
 publish: docker
 	./hack/build-docker.sh push ${WHAT}
 
-manifests: $(wildcard cluster/manifest/*.in)
+manifests: $(wildcard manifest/*.in)
 	./hack/build-manifests.sh
 
 check: check-bash
diff --git a/cluster/deploy.sh b/cluster/deploy.sh
index 61d2dec4280e..043be452105a 100755
--- a/cluster/deploy.sh
+++ b/cluster/deploy.sh
@@ -5,14 +5,14 @@ set -ex
 KUBECTL=${KUBECTL:-kubectl}
 
 echo "Cleaning up ..."
-for i in `ls cluster/manifest/*.yaml`; do
+for i in `ls manifest/*.yaml`; do
     $KUBECTL delete -f $i --grace-period 0 2>/dev/null || :
 done
 
 sleep 2
 
 echo "Deploying ..."
-for i in `ls cluster/manifest/*.yaml`; do
+for i in `ls manifest/*.yaml`; do
     $KUBECTL create -f $i
 done
 echo "Done"
diff --git a/hack/config.sh b/hack/config.sh
index 0ad245383211..56cdd2cb507c 100644
--- a/hack/config.sh
+++ b/hack/config.sh
@@ -2,6 +2,6 @@ binaries="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api"
 docker_images="$binaries images/haproxy"
 docker_prefix=kubevirt
 docker_tag=latest
-manifest_templates="`ls cluster/manifest/*.in`"
+manifest_templates="`ls manifest/*.in`"
 master_ip=192.168.200.2
 network_provider=weave
diff --git a/cluster/manifest/haproxy.yaml.in b/manifest/haproxy.yaml.in
similarity index 100%
rename from cluster/manifest/haproxy.yaml.in
rename to manifest/haproxy.yaml.in
diff --git a/cluster/manifest/virt-api.yaml.in b/manifest/virt-api.yaml.in
similarity index 100%
rename from cluster/manifest/virt-api.yaml.in
rename to manifest/virt-api.yaml.in
diff --git a/cluster/manifest/virt-controller.yaml.in b/manifest/virt-controller.yaml.in
similarity index 100%
rename from cluster/manifest/virt-controller.yaml.in
rename to manifest/virt-controller.yaml.in
diff --git a/cluster/manifest/virt-handler.yaml.in b/manifest/virt-handler.yaml.in
similarity index 100%
rename from cluster/manifest/virt-handler.yaml.in
rename to manifest/virt-handler.yaml.in
diff --git a/cluster/manifest/vm-resource.yaml.in b/manifest/vm-resource.yaml.in
similarity index 100%
rename from cluster/manifest/vm-resource.yaml.in
rename to manifest/vm-resource.yaml.in