From 6f05ccb276f07543ae4576496de745f1a947bfa4 Mon Sep 17 00:00:00 2001 From: Frank Kong Date: Fri, 5 Jan 2024 17:25:07 -0500 Subject: [PATCH] fix: set route host properly when clusterRouterBase is set --- charts/backstage/Chart.yaml | 2 +- charts/backstage/README.md | 2 +- charts/backstage/templates/route.yaml | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index a452acd5..64dec060 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -41,4 +41,4 @@ sources: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.11.4 +version: 2.12.0 diff --git a/charts/backstage/README.md b/charts/backstage/README.md index 14501fec..6e673a69 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -2,7 +2,7 @@ # Janus-IDP Backstage Helm Chart [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/janus-idp&style=flat-square)](https://artifacthub.io/packages/search?repo=janus-idp) -![Version: 2.11.4](https://img.shields.io/badge/Version-2.11.4-informational?style=flat-square) +![Version: 2.12.0](https://img.shields.io/badge/Version-2.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for deploying a Backstage application diff --git a/charts/backstage/templates/route.yaml b/charts/backstage/templates/route.yaml index c4f1f0bc..09ab68b4 100644 --- a/charts/backstage/templates/route.yaml +++ b/charts/backstage/templates/route.yaml @@ -19,8 +19,11 @@ metadata: {{- end }} {{- end }} spec: -{{- if .Values.route.host }} - host: {{ tpl .Values.route.host . }} +{{- $host := tpl .Values.route.host . -}} +{{- if $host }} + host: {{ $host }} +{{- else if .Values.global.clusterRouterBase }} + host: {{ include "janus-idp.hostname" . }} {{- end }} {{- if .Values.route.path }} path: {{ .Values.route.path }}