Skip to content

Commit

Permalink
Serving from nav.tum.de (#211)
Browse files Browse the repository at this point in the history
enabled serving from nav.tum.de
  • Loading branch information
CommanderStorm committed Sep 26, 2022
1 parent 21c7c6a commit 2f47066
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions deployment/k3s/templates/ingress/https-cert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ spec:
- {{ .Values.url }}
{{ if eq "nav.tum.sexy" .Values.url }}
- nav.tum.app
- nav.tum.de
{{ end }}
secretName: {{ .Values.url }}
issuerRef:
Expand Down
16 changes: 8 additions & 8 deletions deployment/k3s/templates/ingress/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
# temporary workaround for traefik bug (interoperability with ingress)
- kind: Rule
match: |
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
PathPrefix(`/.well-known/acme-challenge/`)
priority: 13
services:
Expand All @@ -21,15 +21,15 @@ spec:
kind: Service
- kind: Rule
match: |
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
PathPrefix(`/api/`)
priority: 12
services:
- name: api-svc
port: 7000
- kind: Rule
match: |
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
PathPrefix(`/maps/`)
priority: 11
services:
Expand All @@ -39,15 +39,15 @@ spec:
- name: stripprefix
- kind: Rule
match: |
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
PathPrefix(`/cdn/`)
priority: 10
services:
- name: cdn-svc
port: 8000
- kind: Rule
match: |
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
PathPrefix(`/rendertron/`)
priority: 9
services:
Expand All @@ -56,7 +56,7 @@ spec:
middlewares:
- name: stripprefix
- kind: Rule
match: {{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }}
match: {{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }}
priority: 8
services:
- name: webclient-svc
Expand All @@ -78,15 +78,15 @@ spec:
# temproary workaround for traefik bug (interoperability with ingress)
- kind: Rule
match: |
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
{{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }} &&
PathPrefix(`/.well-known/acme-challenge/`)
priority: 12
services:
- name: cm-acme-http-solver-wr5tp
port: 8089
kind: Service
- kind: Rule
match: {{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }}
match: {{ if eq "nav.tum.sexy" .Values.url }}( Host(`{{ .Values.url }}`) || Host(`nav.tum.app`)) || Host(`nav.tum.de`)) {{ else }} Host(`{{ .Values.url }}`) {{ end }}
priority: 9
services:
- name: noop@internal
Expand Down

0 comments on commit 2f47066

Please sign in to comment.