From 1ba7f026ad9724f17d921593b1ccba5d7413db59 Mon Sep 17 00:00:00 2001
From: Valentin Vieriu <valentin.vieriu@sap.com>
Date: Fri, 24 Jul 2020 08:11:56 +0200
Subject: [PATCH] fixed the local registry

---
 .gitignore              | 3 +++
 download-kyma-charts.sh | 1 +
 kyma-k3d-delete.sh      | 3 ++-
 kyma-k3d.sh             | 8 +++++---
 registries.yaml         | 6 ++++++
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 registries.yaml

diff --git a/.gitignore b/.gitignore
index 36a41df..13a9590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 resources
+node_modules
+dist
+registry
 coredns-patch.yaml
 kyma.crt
diff --git a/download-kyma-charts.sh b/download-kyma-charts.sh
index c5153c2..8c9e971 100755
--- a/download-kyma-charts.sh
+++ b/download-kyma-charts.sh
@@ -1,4 +1,5 @@
 curl https://codeload.github.com/kyma-project/kyma/zip/master --output kyma-master.zip
 unzip -qq kyma-master.zip kyma-master/resources/*
+rm -rf ./resources
 mv kyma-master/resources .
 rm -Rf ./kyma-master*
diff --git a/kyma-k3d-delete.sh b/kyma-k3d-delete.sh
index 45e54aa..7b31e2f 100755
--- a/kyma-k3d-delete.sh
+++ b/kyma-k3d-delete.sh
@@ -1,3 +1,4 @@
 # This will delete the cluster and the docker registry
 k3d cluster delete kyma
-docker rm -f  k3d-registry
\ No newline at end of file
+docker rm -f  registry.localhost
+docker network rm k3d-kyma
\ No newline at end of file
diff --git a/kyma-k3d.sh b/kyma-k3d.sh
index 7b97e25..636c653 100755
--- a/kyma-k3d.sh
+++ b/kyma-k3d.sh
@@ -8,7 +8,8 @@ function waitForJobs() {
 docker run -d \
   -p 5000:5000 \
   --restart=always \
-  --name k3d-registry \
+  --name registry.localhost \
+  --network k3d-kyma \
   -v $PWD/registry:/var/lib/registry \
   registry:2
 
@@ -18,9 +19,10 @@ k3d cluster create kyma \
     --port 443:443@loadbalancer \
     --k3s-server-arg --no-deploy \
     --k3s-server-arg traefik \
+    --volume $PWD/registries.yaml:/etc/rancher/k3s/registries.yaml \
     --timeout 60s 
 
-
+docker network connect k3d-kyma registry.localhost
 
 # Delete cluster with keep-registry-volume to cache docker images
 # k3d cluster delete kyma
@@ -58,7 +60,7 @@ helm upgrade -i testing resources/testing -n kyma-system &
 kubectl apply -f cert-manager.yaml &
 
 # Patch CoreDNS with entries for registry.localhost and *.local.kyma.dev
-REGISTRY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' /k3d-registry)
+REGISTRY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' /registry.localhost)
 sed "s/REGISTRY_IP/$REGISTRY_IP/" coredns-patch.tpl >coredns-patch.yaml
 kubectl -n kube-system patch cm coredns --patch "$(cat coredns-patch.yaml)" &
 helm upgrade -i istio resources/istio --set global.isLocalEnv=true -n istio-system &
diff --git a/registries.yaml b/registries.yaml
new file mode 100644
index 0000000..29c64aa
--- /dev/null
+++ b/registries.yaml
@@ -0,0 +1,6 @@
+mirrors:
+  registry.localhost:5000:
+    endpoint:
+    - http://registry.localhost:5000
+  configs: {}
+  auths: {}
\ No newline at end of file