From 2e1eb475e9789c4592061dbe2a5324f3e4a9f987 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Tue, 22 Jun 2021 09:29:48 +0200
Subject: [PATCH] removed docker-registry-ui submod

---
 .gitmodules                                   |  3 ---
 apps/docker-registry/docker-registry-ui       |  1 -
 apps/docker-registry/docker-registry-ui.yaml  | 13 ++++++-------
 apps/docker-registry/registry-deployment.yaml |  2 +-
 apps/smarthome/home-assistant.yaml            |  4 ++--
 5 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 160000 apps/docker-registry/docker-registry-ui

diff --git a/.gitmodules b/.gitmodules
index 29c06a2..97ea2ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,6 +52,3 @@
 [submodule "nfs-subdir-external-provisioner"]
 	path = nfs-subdir-external-provisioner
 	url = https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner.git
-[submodule "apps/docker-registry/docker-registry-ui"]
-	path = apps/docker-registry/docker-registry-ui
-	url = https://github.com/Joxit/docker-registry-ui.git
diff --git a/apps/docker-registry/docker-registry-ui b/apps/docker-registry/docker-registry-ui
deleted file mode 160000
index 6b012cc..0000000
--- a/apps/docker-registry/docker-registry-ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6b012cc8fd21d473a24bbb7ee19bfdb0499c1504
diff --git a/apps/docker-registry/docker-registry-ui.yaml b/apps/docker-registry/docker-registry-ui.yaml
index 519b52f..f83786c 100644
--- a/apps/docker-registry/docker-registry-ui.yaml
+++ b/apps/docker-registry/docker-registry-ui.yaml
@@ -20,19 +20,18 @@ spec:
     spec:
       containers:
         - name: registry-ui
-          image: cr.lan/docker-registry-ui:arm64
+          #image: cr.lan/docker-registry-ui:arm64
+          image: docker.io/joxit/docker-registry-ui:main-debian
           imagePullPolicy: Always
           env:
-            #- name: URL
-            #  value: "https://cr.lan"
+            - name: NGINX_PROXY_PASS_URL
+              value: "http://cr-ui.lan"
             - name: REGISTRY_TITLE
               value: "cReg"
             - name: DELETE_IMAGES
               value: "true"
             - name: REGISTRY_URL
-              value: "https://cr.lan"
-            #- name: PULL_URL
-            #  value: "https://cr.lan"
+              value: "http://cr.lan"
           ports:
             - name: http
               containerPort: 80
@@ -76,7 +75,7 @@ metadata:
     name: docker-registry-ui
     annotations:
       nginx.ingress.kubernetes.io/enable-cors: "true"
-      nginx.ingress.kubernetes.io/cors-allow-origin: "http://cr-ui.lan"
+      nginx.ingress.kubernetes.io/cors-allow-origin: "*"
       nginx.ingress.kubernetes.io/cors-expose-headers: "*"
 spec:
     rules:
diff --git a/apps/docker-registry/registry-deployment.yaml b/apps/docker-registry/registry-deployment.yaml
index 25bdcbf..44378f9 100644
--- a/apps/docker-registry/registry-deployment.yaml
+++ b/apps/docker-registry/registry-deployment.yaml
@@ -86,7 +86,7 @@ data:
       addr: :5000
       headers:
         X-Content-Type-Options: [nosniff]
-        Access-Control-Allow-Origin: ['*']
+        Access-Control-Allow-Origin: ['*', 'http://cr-ui.lan']
         Access-Control-Allow-Methods: ['HEAD', 'GET', 'OPTIONS', 'DELETE']
         Access-Control-Allow-Headers: ['Authorization', 'Accept']
         Access-Control-Max-Age: [1728000]
diff --git a/apps/smarthome/home-assistant.yaml b/apps/smarthome/home-assistant.yaml
index 48881fc..5ca053d 100644
--- a/apps/smarthome/home-assistant.yaml
+++ b/apps/smarthome/home-assistant.yaml
@@ -35,13 +35,13 @@ spec:
           httpGet:
             path: /
             port: http
-          initialDelaySeconds: 60
+          initialDelaySeconds: 300
           periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /
             port: http
-          initialDelaySeconds: 60
+          initialDelaySeconds: 120
           periodSeconds: 5
         resources:
           requests: