From 5ae9993e93dc93523633cf35576d9c7fbb539787 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 18 Apr 2025 13:41:34 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(helm)=20charts=20generate=20invali?= =?UTF-8?q?d=20YAML=20for=20collaboration=20API=20/=20WS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #890 Remove the service blocks outside the conditionals in the collaboration API and WS templates. Signed-off-by: Richard Jones --- CHANGELOG.md | 3 +++ src/helm/impress/templates/ingress_collaboration_api.yaml | 4 ---- src/helm/impress/templates/ingress_collaboration_ws.yaml | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40e36bf12..77c79eef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ and this project adheres to - 🚸(backend) make document search on title accent-insensitive #874 - 🚩 add homepage feature flag #861 +## Fixed + +- 🐛(helm) charts generate invalid YAML for collaboration API / WS #890 ## [3.1.0] - 2025-04-07 diff --git a/src/helm/impress/templates/ingress_collaboration_api.yaml b/src/helm/impress/templates/ingress_collaboration_api.yaml index f4dc92ef8..30d632791 100644 --- a/src/helm/impress/templates/ingress_collaboration_api.yaml +++ b/src/helm/impress/templates/ingress_collaboration_api.yaml @@ -51,10 +51,6 @@ spec: 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" . }} diff --git a/src/helm/impress/templates/ingress_collaboration_ws.yaml b/src/helm/impress/templates/ingress_collaboration_ws.yaml index 6bd4325e1..887f74dd7 100644 --- a/src/helm/impress/templates/ingress_collaboration_ws.yaml +++ b/src/helm/impress/templates/ingress_collaboration_ws.yaml @@ -51,10 +51,6 @@ spec: 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" . }}