From 650f7a266ee51aa5867fc8a5f0c58997eb47bb09 Mon Sep 17 00:00:00 2001 From: Emanuele Libralato Date: Wed, 19 Jun 2019 14:57:27 +0200 Subject: [PATCH] refactor: moved default-backend image in own repo --- .../system/default-backend/404.html | 12 --------- .../system/default-backend/Dockerfile | 4 --- .../system/default-backend/garden.yml | 1 + .../system/default-backend/nginx.conf | 27 ------------------- 4 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 garden-service/static/kubernetes/system/default-backend/404.html delete mode 100644 garden-service/static/kubernetes/system/default-backend/Dockerfile delete mode 100644 garden-service/static/kubernetes/system/default-backend/nginx.conf diff --git a/garden-service/static/kubernetes/system/default-backend/404.html b/garden-service/static/kubernetes/system/default-backend/404.html deleted file mode 100644 index 3b2f94e8af..0000000000 --- a/garden-service/static/kubernetes/system/default-backend/404.html +++ /dev/null @@ -1,12 +0,0 @@ - - - -

Garden

- 404 Not Found — We've got some good news and some bad news: - - We suggest running garden get status to check the exposed endpoints and whether your services are deployed and healthy. 🚀 - - diff --git a/garden-service/static/kubernetes/system/default-backend/Dockerfile b/garden-service/static/kubernetes/system/default-backend/Dockerfile deleted file mode 100644 index ef28cb6b1f..0000000000 --- a/garden-service/static/kubernetes/system/default-backend/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM nginx:1.15.3-alpine - -ADD nginx.conf /etc/nginx/conf.d/default.conf -ADD 404.html /opt/local/html/404.html diff --git a/garden-service/static/kubernetes/system/default-backend/garden.yml b/garden-service/static/kubernetes/system/default-backend/garden.yml index bab44d66aa..5ef074694b 100644 --- a/garden-service/static/kubernetes/system/default-backend/garden.yml +++ b/garden-service/static/kubernetes/system/default-backend/garden.yml @@ -2,6 +2,7 @@ module: name: default-backend description: Default backend ingress controller type: container + image: gardendev/default-backend:v0.1 services: - name: default-backend ports: diff --git a/garden-service/static/kubernetes/system/default-backend/nginx.conf b/garden-service/static/kubernetes/system/default-backend/nginx.conf deleted file mode 100644 index 7b75b679fc..0000000000 --- a/garden-service/static/kubernetes/system/default-backend/nginx.conf +++ /dev/null @@ -1,27 +0,0 @@ - # The default server. -server { - listen 80 default_server; - listen 8080; - server_name _; - - root /opt/local/html; - - error_page 404 /404.html; - - # needs to respond to /healthz for http health checks on port 8080 - location /healthz { - return 200 'OK!'; - # To see reply in browser - add_header Content-Type text/plain; - - } - # Everything is a 404 - location / { - return 404; - } - - # EDIT: You may need this to prevent return 404; recursion - location = /404.html { - internal; - } -}