From bb0a83401535a06aeba4ff14014dcb751a5e7188 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 5 Feb 2020 09:57:37 +0100
Subject: [PATCH] removed ingress redirects as they are not working
---
.gitlab/auto-deploy-values.yaml | 1 -
.gitlab/development-values.yaml | 2 --
chart/templates/ingress-redirects.yaml | 36 --------------------------
3 files changed, 39 deletions(-)
delete mode 100644 .gitlab/auto-deploy-values.yaml
delete mode 100644 chart/templates/ingress-redirects.yaml
diff --git a/.gitlab/auto-deploy-values.yaml b/.gitlab/auto-deploy-values.yaml
deleted file mode 100644
index 33105e5b1..000000000
--- a/.gitlab/auto-deploy-values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-workers:
\ No newline at end of file
diff --git a/.gitlab/development-values.yaml b/.gitlab/development-values.yaml
index ef67887bd..2f63c80e7 100644
--- a/.gitlab/development-values.yaml
+++ b/.gitlab/development-values.yaml
@@ -2,8 +2,6 @@ service:
externalPort: 80
internalPort: 80
commonName: ""
- redirectHosts:
- - www.metager3.de
ingress:
annotations:
certmanager.k8s.io/cluster-issuer: letsencrypt-prod
\ No newline at end of file
diff --git a/chart/templates/ingress-redirects.yaml b/chart/templates/ingress-redirects.yaml
deleted file mode 100644
index ff4b249f0..000000000
--- a/chart/templates/ingress-redirects.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-{{- if .Values.service.redirectHosts -}}
-{{- if .Values.service.enabled -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
- name: {{ template "fullname" . -}}-redirects
- labels:
- app: {{ template "appname" . }}
- chart: "{{ .Chart.Name -}}-{{- .Chart.Version| replace "+" "_" }}"
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
- annotations:
- ingress.kubernetes.io/configuration-snippet: "return 301 $scheme://{{ template "hostname" .Values.service.url }}$request_uri;"
-spec:
-{{- if .Values.ingress.tls.enabled }}
- tls:
- - hosts:
-{{- range $host := .Values.service.redirectHosts }}
- - {{ $host }}
-{{- end }}
- secretName: {{ .Values.ingress.tls.secretName | default (printf "%s-redirects-tls" (include "fullname" .)) }}
-{{- end }}
- rules:
-{{- $dot := . }}
-{{- $values := .Values }}
-{{- range $host := .Values.service.redirectHosts }}
- - host: {{ $host }}
- http:
- paths:
- - path: /
- backend:
- serviceName: {{ template "fullname" $dot }}
- servicePort: {{ $values.service.externalPort }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
\ No newline at end of file
--
GitLab