From b77ce1416650ccf0d6438c1f1209e58ab5abb9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20D=C3=ADaz=20G?= Date: Tue, 4 Jun 2024 14:48:30 -0600 Subject: [PATCH] feat(ingress): add path as property configurable (#196) * feat(ingress): add path as property configurable Signed-off-by: Jason Diaz G. Signed-off-by: Jason Diaz * fix(docs): Add the correct expected ingress default value in README.md file Signed-off-by: Jason Diaz * chore(chart-version): Bump chart version to 1.9.5 Signed-off-by: Jason Diaz * fix(schema): Change ingress path examples in chart schema Signed-off-by: Jason Diaz * chore(chart-version): Bump chart version to 1.9.5 in README.md --------- Signed-off-by: Jason Diaz G. Signed-off-by: Jason Diaz Co-authored-by: Jason Diaz G --- charts/backstage/Chart.yaml | 2 +- charts/backstage/README.md | 5 +++-- charts/backstage/templates/ingress.yaml | 2 +- charts/backstage/values.schema.json | 8 ++++++++ charts/backstage/values.schema.tmpl.json | 8 ++++++++ charts/backstage/values.yaml | 3 +++ 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index 480c8c0..af3428b 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -38,4 +38,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: 1.9.4 +version: 1.9.5 diff --git a/charts/backstage/README.md b/charts/backstage/README.md index a56b9ad..6b2a2bb 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -2,7 +2,7 @@ # Backstage Helm Chart [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/backstage)](https://artifacthub.io/packages/search?repo=backstage) -![Version: 1.9.4](https://img.shields.io/badge/Version-1.9.4-informational?style=flat-square) +![Version: 1.9.5](https://img.shields.io/badge/Version-1.9.5-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 @@ -157,11 +157,12 @@ Kubernetes: `>= 1.19.0-0` | global | Global parameters Global Docker image parameters Please, note that this will override the image parameters, including dependencies, configured to use the global value Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass | object | See below | | global.imagePullSecrets | Global Docker registry secret names as an array
E.g. `imagePullSecrets: [myRegistryKeySecretName]` | list | `[]` | | global.imageRegistry | Global Docker image registry | string | `""` | -| ingress | Ingress parameters | object | `{"annotations":{},"className":"","enabled":false,"host":"","tls":{"enabled":false,"secretName":""}}` | +| ingress | Ingress parameters | object | `{"annotations":{},"className":"","enabled":false,"host":"","path":"/","tls":{"enabled":false,"secretName":""}}` | | ingress.annotations | Additional annotations for the Ingress resource | object | `{}` | | ingress.className | Name of the IngressClass cluster resource which defines which controller will implement the resource (e.g nginx) | string | `""` | | ingress.enabled | Enable the creation of the ingress resource | bool | `false` | | ingress.host | Hostname to be used to expose the route to access the backstage application (e.g: backstage.IP.nip.io) | string | `""` | +| ingress.path | Path to be used to expose the full route to access the backstage application (e.g: IP.nip.io/backstage) | string | `"/"` | | ingress.tls | Ingress TLS parameters | object | `{"enabled":false,"secretName":""}` | | ingress.tls.enabled | Enable TLS configuration for the host defined at `ingress.host` parameter | bool | `false` | | ingress.tls.secretName | The name to which the TLS Secret will be called | string | `""` | diff --git a/charts/backstage/templates/ingress.yaml b/charts/backstage/templates/ingress.yaml index fe94e5e..b7e82b1 100644 --- a/charts/backstage/templates/ingress.yaml +++ b/charts/backstage/templates/ingress.yaml @@ -30,7 +30,7 @@ spec: - host: {{ include "common.tplvalues.render" ( dict "value" .Values.ingress.host "context" $ ) }} http: paths: - - path: / + - path: {{ .Values.ingress.path }} pathType: Prefix backend: service: diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json index 810c02e..651ef2b 100644 --- a/charts/backstage/values.schema.json +++ b/charts/backstage/values.schema.json @@ -6100,6 +6100,14 @@ "title": "Hostname to be used to expose the route to access the backstage application.", "type": "string" }, + "path": { + "default": "/", + "examples": [ + "/backstage" + ], + "title": "Path to be used to expose the full route to access the backstage application.", + "type": "string" + }, "tls": { "additionalProperties": false, "properties": { diff --git a/charts/backstage/values.schema.tmpl.json b/charts/backstage/values.schema.tmpl.json index f140b99..3cafb2e 100644 --- a/charts/backstage/values.schema.tmpl.json +++ b/charts/backstage/values.schema.tmpl.json @@ -143,6 +143,14 @@ "backstage.10.0.0.1.nip.io" ] }, + "path": { + "title": "Path to be used to expose the full route to access the backstage application.", + "type": "string", + "default": "/", + "examples": [ + "/backstage" + ] + }, "tls": { "title": "Ingress TLS parameters", "type": "object", diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml index bb371f2..87d9312 100644 --- a/charts/backstage/values.yaml +++ b/charts/backstage/values.yaml @@ -67,6 +67,9 @@ ingress: # -- Hostname to be used to expose the route to access the backstage application (e.g: backstage.IP.nip.io) host: "" + # -- Path to be used to expose the full route to access the backstage application (e.g: IP.nip.io/backstage) + path: "/" + # -- Ingress TLS parameters tls: