Merge branch '77-static-http-route-api-feed' into 'development'

fix:#77 set static http route for /api/feed only

See merge request htwk-software/htwkalender!120
This commit is contained in:
Elmar Kresse
2025-04-28 18:54:55 +02:00
3 changed files with 121 additions and 74 deletions

View File

@ -0,0 +1,23 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Chart.Name }}-redirect
namespace: {{ .Release.Namespace }}
labels:
{{- include "htwkalender.labels" . | nindent 4 }}
{{- if .Values.ingress.httpsRedirect.annotations }}
annotations:
{{ toYaml .Values.ingress.httpsRedirect.annotations | nindent 4 }}
{{- else }}
annotations: []
{{- end }}
spec:
ingressClassName: "PLACEHOLDER"
tls:
- hosts:
{{- range .Values.ingress.httpsRedirect.hosts }}
- {{ .host | quote }}
{{- end }}
secretName: {{ $.Chart.Name }}-cert
rules:
{{- toYaml .Values.ingress.httpsRedirect.hosts | nindent 4 }}

View File

@ -0,0 +1,23 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Chart.Name }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "htwkalender.labels" . | nindent 4 }}
{{- if .Values.ingress.https.annotations }}
annotations:
{{ toYaml .Values.ingress.https.annotations | nindent 4 }}
{{- else }}
annotations: []
{{- end }}
spec:
ingressClassName: "PLACEHOLDER"
tls:
- hosts:
{{- range .Values.ingress.https.hosts }}
- {{ .host | quote }}
{{- end }}
secretName: {{ $.Chart.Name }}-cert
rules:
{{- toYaml .Values.ingress.https.hosts | nindent 4 }}

View File

@ -55,77 +55,78 @@ readinessProbe:
port: http port: http
ingress: ingress:
hosts: https:
- host: *frontend_host annotations:
http: traefik.ingress.kubernetes.io/router.middlewares: ""
paths: hosts:
- path: / - host: *frontend_host
pathType: ImplementationSpecific http:
backend: paths:
service: - path: /api/feed
name: *service_frontend pathType: Prefix
port: backend:
number: *service_frontend_port service:
- path: /api/feed/room name: *service_ical
pathType: ImplementationSpecific port:
backend: number: *service_ical_port
service: httpsRedirect:
name: *service_ical hosts:
port: - host: *frontend_host
number: *service_ical_port http:
- path: /api/feed paths:
pathType: ImplementationSpecific - path: /
backend: pathType: ImplementationSpecific
service: backend:
name: *service_ical service:
port: name: *service_frontend
number: *service_ical_port port:
- path: /api number: *service_frontend_port
pathType: ImplementationSpecific - path: /api
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
- path: /api/modules number: *service_data_manager_port
pathType: ImplementationSpecific - path: /api/modules
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
- path: /api/events/types number: *service_data_manager_port
pathType: ImplementationSpecific - path: /api/events/types
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
- path: /api/rooms number: *service_data_manager_port
pathType: ImplementationSpecific - path: /api/rooms
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
- path: /api/schedule number: *service_data_manager_port
pathType: ImplementationSpecific - path: /api/schedule
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
- path: /api/courses number: *service_data_manager_port
pathType: ImplementationSpecific - path: /api/courses
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
- path: /_ number: *service_data_manager_port
pathType: ImplementationSpecific - path: /_
backend: pathType: ImplementationSpecific
service: backend:
name: *service_data_manager service:
port: name: *service_data_manager
number: *service_data_manager_port port:
number: *service_data_manager_port