Merge branch 'main' into 'development'

# Conflicts:
#   charts/values.yaml

charts/templates/deployment-frontend.yaml

@@ -36,7 +36,7 @@ spec:
           volumeMounts:
             {{- if .Values.production }}
             - name: configmap-google
-              mountPath: /{{ .Values.frontend.googleSiteVerification }}.html
+              mountPath: "{{ .Values.frontend.htmlRootPath }}/{{ .Values.frontend.googleSiteVerification }}.html"
               subPath: {{ .Values.frontend.googleSiteVerification }}.html
               readOnly: true
             {{- end }}

charts/templates/ingress-https-ipwhitelist.yaml

@@ -1,19 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ .Chart.Name }}-ipwhitelist
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "htwkalender.labels" . | nindent 4 }}
-  annotations:
-    traefik.ingress.kubernetes.io/router.middlewares: "{{- printf "%s-%s@kubernetescrd" .Release.Namespace .Values.middlewares.httpsIPWhitelist.name }},traefik-https-redirect@kubernetescrd"
-spec:
-  ingressClassName: "PLACEHOLDER"
-  tls:
-    - hosts:
-      {{- range .Values.ingress.httpsIPWhitelist.hosts }}
-        - {{ .host | quote }}
-      {{- end }}
-      secretName: {{ $.Chart.Name }}-cert
-  rules:
-    {{- toYaml .Values.ingress.httpsIPWhitelist.hosts | nindent 4 }}

charts/templates/ingress-https-redirect.yaml

@@ -1,21 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ .Chart.Name }}-redirect
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "htwkalender.labels" . | nindent 4 }}
-  {{- with .Values.ingress.httpsRedirect.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- 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 }}

charts/templates/ingress-https.yaml

@@ -1,21 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ .Chart.Name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "htwkalender.labels" . | nindent 4 }}
-  {{- with .Values.ingress.https.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- 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 }}

charts/templates/middleware-whitelist-ip.yaml

@@ -1,11 +0,0 @@
-apiVersion: traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: {{ .Values.middlewares.httpsIPWhitelist.name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "htwkalender.labels" . | nindent 4 }}
-spec:
-  ipWhiteList:
-    sourceRange:
-      - 10.0.0.0/29

charts/values.yaml

@@ -28,6 +28,7 @@ frontend:
   name: frontend
   host: &frontend_host "FRONTEND_URL"
   googleSiteVerification: "PLACEHOLDER"
+  htmlRootPath: "/opt/bitnami/nginx/html"
   replicas: 1
   image:
     name: "PLACEHOLDER"
@@ -54,88 +55,78 @@ readinessProbe:
     path: /
     port: http
 
-middlewares:
-  httpsIPWhitelist:
-    name: ipwhitelist-fsrim-subnet
-
 ingress:
-  https:
-    annotations:
-      traefik.ingress.kubernetes.io/router.middlewares: ""
-    hosts:
-      - host: *frontend_host
-        http:
-          paths:
-            - path: /api/feed
-              pathType: Prefix
-              backend:
-                service:
-                  name: *service_ical
-                  port:
-                    number: *service_ical_port
-  httpsIPWhitelist:
-    hosts:
-      - host: *frontend_host
-        http:
-          paths:
-            - path: /_
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
-  httpsRedirect:
-    hosts:
-      - host: *frontend_host
-        http:
-          paths:
-            - path: /
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_frontend
-                  port:
-                    number: *service_frontend_port
-            - path: /api
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
-            - path: /api/modules
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
-            - path: /api/events/types
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
-            - path: /api/rooms
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
-            - path: /api/schedule
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
-            - path: /api/courses
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: *service_data_manager
-                  port:
-                    number: *service_data_manager_port
+  hosts:
+    - host: *frontend_host
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_frontend
+                port:
+                  number: *service_frontend_port
+          - path: /api/feed/room
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_ical
+                port:
+                  number: *service_ical_port
+          - path: /api/feed
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_ical
+                port:
+                  number: *service_ical_port
+          - path: /api
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port
+          - path: /api/modules
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port
+          - path: /api/events/types
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port
+          - path: /api/rooms
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port
+          - path: /api/schedule
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port
+          - path: /api/courses
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port
+          - path: /_
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: *service_data_manager
+                port:
+                  number: *service_data_manager_port