fix namespaces and selectors

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

Author: butonic

templates/gateway/gateway.yaml

@@ -16,85 +16,85 @@ spec:
   listeners:
     - name: opencloud-https
       protocol: HTTPS
-      port: 443
+      port: {{ .Valuees.httpRoute.gateway.port | default 443 }}
       hostname: {{ .Values.global.domain.opencloud | quote }}
       tls:
         mode: Terminate
         certificateRefs:
           - name: opencloud-wildcard-tls
-            namespace: kube-system
+            namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
       allowedRoutes:
         namespaces:
           from: Selector
           selector:
             matchLabels:
-              {{- include "opencloud.selectorLabels" . | nindent 14 }}
+              kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
     {{- if .Values.keycloak.enabled }}
     - name: keycloak-https
       protocol: HTTPS
-      port: 443
+      port: {{ .Valuees.httpRoute.gateway.port | default 443 }}
       hostname: {{ .Values.global.domain.keycloak | quote }}
       tls:
         mode: Terminate
         certificateRefs:
           - name: opencloud-wildcard-tls
-            namespace: kube-system
+            namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
       allowedRoutes:
         namespaces:
           from: Selector
           selector:
             matchLabels:
-              {{- include "opencloud.selectorLabels" . | nindent 14 }}
+              kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
     {{- end }}
     {{- if and .Values.opencloud.storage.s3.internal.enabled .Values.opencloud.storage.s3.internal.httpRoute.enabled }}
     - name: minio-https
       protocol: HTTPS
-      port: 443
+      port: {{ .Valuees.httpRoute.gateway.port | default 443 }}
       hostname: {{ .Values.global.domain.minio | quote }}
       tls:
         mode: Terminate
         certificateRefs:
           - name: opencloud-wildcard-tls
-            namespace: kube-system
+            namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
       allowedRoutes:
         namespaces:
           from: Selector
           selector:
             matchLabels:
-              {{- include "opencloud.selectorLabels" . | nindent 14 }}
+              kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
     {{- end }}
     {{- if .Values.onlyoffice.enabled }}
     - name: onlyoffice-https
       protocol: HTTPS
-      port: 443
+      port: {{ .Valuees.httpRoute.gateway.port | default 443 }}
       hostname: {{ .Values.global.domain.onlyoffice | quote }}
       tls:
         mode: Terminate
         certificateRefs:
           - name: opencloud-wildcard-tls
-            namespace: kube-system
+            namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
       allowedRoutes:
         namespaces:
           from: Selector
           selector:
             matchLabels:
-              {{- include "opencloud.selectorLabels" . | nindent 14 }}
+              kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
     {{- end }}
     {{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
     - name: collaboration-https
       protocol: HTTPS
-      port: 443
+      port: {{ .Valuees.httpRoute.gateway.port | default 443 }}
       hostname: {{ .Values.global.domain.wopi | quote }}
       tls:
         mode: Terminate
         certificateRefs:
           - name: opencloud-wildcard-tls
-            namespace: kube-system
+            namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
       allowedRoutes:
         namespaces:
           from: Selector
           selector:
             matchLabels:
-              {{- include "opencloud.selectorLabels" . | nindent 14 }}
+              kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
     {{- end }}
 {{- end }}

templates/gateway/reference-grant.yaml

@@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: ReferenceGrant
 metadata:
   name: {{ include "opencloud.fullname" . }}-reference-grant
-  namespace: {{ .Values.httpRoute.gateway.namespace | default "kube-system" }}
+  namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
   labels:
     {{- include "opencloud.labels" . | nindent 4 }}
 spec:
@@ -27,7 +27,7 @@ spec:
   from:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      namespace: {{ .Values.httpRoute.gateway.namespace | default "kube-system" }}
+      namespace: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
   to:
     - group: ""
       kind: Secret

values.yaml

@@ -509,11 +509,13 @@ httpRoute:
   gateway:
     # Create the gateway
     create: true
+    # HTTPS Port to listen to (k3s traefik defaults to 8443)
+    port: 443
     # Gateway name
     name: opencloud-gateway
-    # Gateway class (defaults to "gateway")
-    className: traefik
+    # Gateway class (defaults to "cilium")
+    className: cilium
     # Gateway namespace (defaults to Release.Namespace)
-    namespace: "kube-system"
+    namespace: ""
     # Gateway annotations
     annotations: