From 8d0fbdfecd6aa55746989476d7bd058248c140c6 Mon Sep 17 00:00:00 2001 From: Quentin BEY Date: Thu, 20 Feb 2025 11:03:24 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B1(helm)=20add=20`resource-server`=20?= =?UTF-8?q?ingress=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The route was added but not declared in the ingress. --- CHANGELOG.md | 1 + src/helm/desk/Chart.yaml | 2 +- src/helm/desk/templates/ingress.yaml | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c46f525..4e69d47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to ### Fixed +- 🧱(helm) add resource-server ingress path #743 - 🌐(backend) synchronize translations with crowdin again ## [1.12.1] - 2025-02-20 diff --git a/src/helm/desk/Chart.yaml b/src/helm/desk/Chart.yaml index d3d1cf1..dbc0d92 100644 --- a/src/helm/desk/Chart.yaml +++ b/src/helm/desk/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 type: application name: desk -version: 0.0.2 +version: 0.0.3 diff --git a/src/helm/desk/templates/ingress.yaml b/src/helm/desk/templates/ingress.yaml index fa6162c..60452bd 100644 --- a/src/helm/desk/templates/ingress.yaml +++ b/src/helm/desk/templates/ingress.yaml @@ -73,7 +73,21 @@ spec: {{- else }} serviceName: {{ include "desk.backend.fullname" . }} servicePort: {{ .Values.backend.service.port }} + {{- end }} + - path: /resource-server + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: Prefix {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ include "desk.backend.fullname" $ }} + port: + number: {{ $.Values.backend.service.port }} + {{- else }} + serviceName: {{ include "desk.backend.fullname" $ }} + servicePort: {{ $.Values.backend.service.port }} + {{- end }} {{- with .Values.ingress.customBackends }} {{- toYaml . | nindent 10 }} {{- end }} @@ -109,7 +123,21 @@ spec: {{- else }} serviceName: {{ include "desk.backend.fullname" $ }} servicePort: {{ $.Values.backend.service.port }} + {{- end }} + - path: /resource-server + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: Prefix {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ include "desk.backend.fullname" $ }} + port: + number: {{ $.Values.backend.service.port }} + {{- else }} + serviceName: {{ include "desk.backend.fullname" $ }} + servicePort: {{ $.Values.backend.service.port }} + {{- end }} {{- with $.Values.ingress.customBackends }} {{- toYaml . | nindent 10 }} {{- end }}