From d3a514506028a303cd72df6ad20da604fa97fec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Paradowski?= <contact@rafalparadowski.com>
Date: Wed, 15 Jul 2020 13:32:25 +0200
Subject: [PATCH] moved yaml files to separate directory

---
 .cilibs/install-and-run-spinnaker.sh          | 20 +++++++++----------
 .cilibs/{ => templates}/floodgate-config.yaml |  0
 .cilibs/{ => templates}/gate-local.yml        |  0
 .../{ => templates}/ingress-mandatory.yaml    |  0
 .../ingress-service-nodeport.yaml             |  0
 .../{ => templates}/kind-cluster-config.yaml  |  0
 .cilibs/{ => templates}/minio-standalone.yaml |  0
 .../{ => templates}/spinnaker-ingress.yaml    |  0
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename .cilibs/{ => templates}/floodgate-config.yaml (100%)
 rename .cilibs/{ => templates}/gate-local.yml (100%)
 rename .cilibs/{ => templates}/ingress-mandatory.yaml (100%)
 rename .cilibs/{ => templates}/ingress-service-nodeport.yaml (100%)
 rename .cilibs/{ => templates}/kind-cluster-config.yaml (100%)
 rename .cilibs/{ => templates}/minio-standalone.yaml (100%)
 rename .cilibs/{ => templates}/spinnaker-ingress.yaml (100%)

diff --git a/.cilibs/install-and-run-spinnaker.sh b/.cilibs/install-and-run-spinnaker.sh
index 65da2ad..7eeabc5 100755
--- a/.cilibs/install-and-run-spinnaker.sh
+++ b/.cilibs/install-and-run-spinnaker.sh
@@ -14,7 +14,7 @@ sudo bash InstallHalyard.sh --version ${HAL_VERSION} --user $USERNAME -y
 hal -v
 
 # Create Kind cluster
-kind create cluster --config="${EXEC_DIR}/kind-cluster-config.yaml"
+kind create cluster --config="${EXEC_DIR}/templates/kind-cluster-config.yaml"
 kubectl config use-context kind-kind
 kubectl cluster-info
 
@@ -34,8 +34,8 @@ hal -q config deploy edit --type distributed --account-name my-k8s-v2-account
 
 ## Install minio
 kubectl create namespace spinnaker
-sed -i 's/LoadBalancer/ClusterIP/g' "${EXEC_DIR}/minio-standalone.yaml"
-kubectl -n spinnaker create -f "${EXEC_DIR}/minio-standalone.yaml"
+sed -i 's/LoadBalancer/ClusterIP/g' "${EXEC_DIR}/templates/minio-standalone.yaml"
+kubectl -n spinnaker create -f "${EXEC_DIR}/templates/minio-standalone.yaml"
 mkdir -p ~/.hal/default/profiles
 echo "spinnaker.s3.versioning: false" >> ~/.hal/default/profiles/front50-local.yml
 
@@ -55,8 +55,8 @@ hal config security api edit --override-base-url='http://spinnaker/api/v1'
 echo 'window.spinnakerSettings.authEnabled = true;' > ~/.hal/default/profiles/settings-local.js
 mkdir -p ~/.hal/default/service-settings
 echo 'healthEndpoint: /api/v1/health' > ~/.hal/default/service-settings/gate.yml
-sed -i "s/GATE_PASS/${GATE_PASS}/g" "${EXEC_DIR}/gate-local.yml"
-cp "${EXEC_DIR}/gate-local.yml" ~/.hal/default/profiles/gate-local.yml
+sed -i "s/GATE_PASS/${GATE_PASS}/g" "${EXEC_DIR}/templates/gate-local.yml"
+cp "${EXEC_DIR}/templates/gate-local.yml" ~/.hal/default/profiles/gate-local.yml
 
 # Install Spinnaker
 hal -q deploy apply
@@ -66,11 +66,11 @@ do
 done
 
 # Install Ingress controller
-kubectl apply -f "${EXEC_DIR}/ingress-mandatory.yaml"
-kubectl apply -f "${EXEC_DIR}/ingress-service-nodeport.yaml"
+kubectl apply -f "${EXEC_DIR}/templastes/ingress-mandatory.yaml"
+kubectl apply -f "${EXEC_DIR}/templates/ingress-service-nodeport.yaml"
 kubectl patch deployments -n ingress-nginx nginx-ingress-controller -p '{"spec":{"template":{"spec":{"containers":[{"name":"nginx-ingress-controller","ports":[{"containerPort":80,"hostPort":80},{"containerPort":443,"hostPort":443}]}],"nodeSelector":{"ingress-ready":"true"},"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Equal","effect":"NoSchedule"}]}}}}'
-kubectl -n spinnaker apply -f "${EXEC_DIR}/spinnaker-ingress.yaml"
+kubectl -n spinnaker apply -f "${EXEC_DIR}/templates/spinnaker-ingress.yaml"
 
 # Generate Floodgate config file
-sed -i "s/GATE_PASS/${GATE_PASS}/g" "${EXEC_DIR}/floodgate-config.yaml"
-cp "${EXEC_DIR}/floodgate-config.yaml" ~/floodgate.yaml
+sed -i "s/GATE_PASS/${GATE_PASS}/g" "${EXEC_DIR}/templates/floodgate-config.yaml"
+cp "${EXEC_DIR}/templates/floodgate-config.yaml" ~/floodgate.yaml
diff --git a/.cilibs/floodgate-config.yaml b/.cilibs/templates/floodgate-config.yaml
similarity index 100%
rename from .cilibs/floodgate-config.yaml
rename to .cilibs/templates/floodgate-config.yaml
diff --git a/.cilibs/gate-local.yml b/.cilibs/templates/gate-local.yml
similarity index 100%
rename from .cilibs/gate-local.yml
rename to .cilibs/templates/gate-local.yml
diff --git a/.cilibs/ingress-mandatory.yaml b/.cilibs/templates/ingress-mandatory.yaml
similarity index 100%
rename from .cilibs/ingress-mandatory.yaml
rename to .cilibs/templates/ingress-mandatory.yaml
diff --git a/.cilibs/ingress-service-nodeport.yaml b/.cilibs/templates/ingress-service-nodeport.yaml
similarity index 100%
rename from .cilibs/ingress-service-nodeport.yaml
rename to .cilibs/templates/ingress-service-nodeport.yaml
diff --git a/.cilibs/kind-cluster-config.yaml b/.cilibs/templates/kind-cluster-config.yaml
similarity index 100%
rename from .cilibs/kind-cluster-config.yaml
rename to .cilibs/templates/kind-cluster-config.yaml
diff --git a/.cilibs/minio-standalone.yaml b/.cilibs/templates/minio-standalone.yaml
similarity index 100%
rename from .cilibs/minio-standalone.yaml
rename to .cilibs/templates/minio-standalone.yaml
diff --git a/.cilibs/spinnaker-ingress.yaml b/.cilibs/templates/spinnaker-ingress.yaml
similarity index 100%
rename from .cilibs/spinnaker-ingress.yaml
rename to .cilibs/templates/spinnaker-ingress.yaml