🔧(helm) add ingress collaboration api

We need to keep the stickyness between the
collaboration api and the ws server, to do so,
we will use "upstream-hash-by: $arg_room", meaning
that the stickyness will be based on the room query.
We need to ahve 2 ingress to handle the
"collaboration_auth", only the ws routes has to
use the "collaboration_auth" subrequest.

src/helm/impress/templates/ingress_collaboration_api.yaml

@@ -0,0 +1,72 @@
+{{- if .Values.ingressCollaborationApi.enabled -}}
+{{- $fullName := include "impress.fullname" . -}}
+{{- if and .Values.ingressCollaborationApi.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingressCollaborationApi.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingressCollaborationApi.annotations "kubernetes.io/ingress.class" .Values.ingressCollaborationApi.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-collaboration-api
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "impress.labels" . | nindent 4 }}
+  {{- with .Values.ingressCollaborationApi.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingressCollaborationApi.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingressCollaborationApi.className }}
+  {{- end }}
+  {{- if .Values.ingressCollaborationApi.tls.enabled }}
+  tls:
+    {{- if .Values.ingressCollaborationApi.host }}
+    - secretName: {{ $fullName }}-tls
+      hosts:
+        - {{ .Values.ingressCollaborationApi.host | quote }}
+    {{- end }}
+    {{- range .Values.ingressCollaborationApi.tls.additional }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- if .Values.ingressCollaborationApi.host }}
+    - host: {{ .Values.ingressCollaborationApi.host | quote }}
+      http:
+        paths:
+          - path: {{ .Values.ingressCollaborationApi.path | quote }}
+            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
+            pathType: ImplementationSpecific
+            {{- end }}
+            backend:
+              service:
+                name: {{ include "impress.yProvider.fullname" . }}
+                port:
+                  number: {{ .Values.yProvider.service.port }}
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ include "impress.yProvider.fullname" . }}
+                port:
+                  number: {{ .Values.yProvider.service.port }}
+              {{- else }}
+              serviceName: {{ include "impress.yProvider.fullname" . }}
+              servicePort: {{ .Values.yProvider.service.port }}
+            {{- end }}
+          {{- with .Values.ingressCollaborationApi.customBackends }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+    {{- end }}
+{{- end }}
+

src/helm/impress/templates/ingress_collaboration_ws.yaml

@@ -1,8 +1,8 @@
-{{- if .Values.ingressWS.enabled -}}
+{{- if .Values.ingressCollaborationWS.enabled -}}
 {{- $fullName := include "impress.fullname" . -}}
-{{- if and .Values.ingressWS.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingressWS.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingressWS.annotations "kubernetes.io/ingress.class" .Values.ingressWS.className}}
+{{- if and .Values.ingressCollaborationWS.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingressCollaborationWS.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingressCollaborationWS.annotations "kubernetes.io/ingress.class" .Values.ingressCollaborationWS.className}}
   {{- end }}
 {{- end }}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -18,22 +18,22 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "impress.labels" . | nindent 4 }}
-  {{- with .Values.ingressWS.annotations }}
+  {{- with .Values.ingressCollaborationWS.annotations }}
   annotations:
   {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if and .Values.ingressWS.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingressWS.className }}
+  {{- if and .Values.ingressCollaborationWS.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingressCollaborationWS.className }}
   {{- end }}
-  {{- if .Values.ingressWS.tls.enabled }}
+  {{- if .Values.ingressCollaborationWS.tls.enabled }}
   tls:
-    {{- if .Values.ingressWS.host }}
+    {{- if .Values.ingressCollaborationWS.host }}
     - secretName: {{ $fullName }}-tls
       hosts:
-        - {{ .Values.ingressWS.host | quote }}
+        - {{ .Values.ingressCollaborationWS.host | quote }}
     {{- end }}
-    {{- range .Values.ingressWS.tls.additional }}
+    {{- range .Values.ingressCollaborationWS.tls.additional }}
     - hosts:
         {{- range .hosts }}
         - {{ . | quote }}
@@ -42,11 +42,11 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-    {{- if .Values.ingressWS.host }}
-    - host: {{ .Values.ingressWS.host | quote }}
+    {{- if .Values.ingressCollaborationWS.host }}
+    - host: {{ .Values.ingressCollaborationWS.host | quote }}
       http:
         paths:
-          - path: {{ .Values.ingressWS.path | quote }}
+          - path: {{ .Values.ingressCollaborationWS.path | quote }}
             {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
             pathType: ImplementationSpecific
             {{- end }}
@@ -64,7 +64,7 @@ spec:
               serviceName: {{ include "impress.yProvider.fullname" . }}
               servicePort: {{ .Values.yProvider.service.port }}
             {{- end }}
-          {{- with .Values.ingressWS.customBackends }}
+          {{- with .Values.ingressCollaborationWS.customBackends }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
     {{- end }}