diff --git a/shiny-server/Chart.yaml b/shiny-server/Chart.yaml index 51c05cd2cc9c0ffc90cfc3f3da28457ccd9e503d..b5a3deb8d6b90772c50f21694987f2ab42c587c6 100644 --- a/shiny-server/Chart.yaml +++ b/shiny-server/Chart.yaml @@ -15,7 +15,7 @@ type: application # 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: 0.6.0 +version: 0.6.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/shiny-server/templates/NOTES.txt b/shiny-server/templates/NOTES.txt index 486150db45616f886dc38da3c1f8df29f28a287c..468b45c60458296cfa4083c49d4fc45948be9907 100644 --- a/shiny-server/templates/NOTES.txt +++ b/shiny-server/templates/NOTES.txt @@ -1,6 +1,6 @@ The application will be up shortly at: -https://{{ .Values.ingress.hostname }} +https://{{ include "chart.hostnameCleaned" . }} Settings: - Image used: {{ .Values.imageFullNameAndTag }} diff --git a/shiny-server/templates/_helpers.tpl b/shiny-server/templates/_helpers.tpl index b4c38025b9921445c6cf1b9f3160ac0ded9d178d..3413fdd94a2564f02c1a488090005510ab68fb0a 100644 --- a/shiny-server/templates/_helpers.tpl +++ b/shiny-server/templates/_helpers.tpl @@ -49,3 +49,7 @@ Selector labels app.kubernetes.io/name: {{ include "chart.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} + +{{- define "chart.hostnameCleaned" -}} +{{- .Values.ingress.hostname | replace "_" "-" | replace "--" "-" | quote }} +{{- end }} \ No newline at end of file diff --git a/shiny-server/templates/ingress.yaml b/shiny-server/templates/ingress.yaml index 2ec83c970645452092f48c8dc170ae373bde8bf6..d1391c275ed45dd2919c9238b84ab5e1fee080b8 100644 --- a/shiny-server/templates/ingress.yaml +++ b/shiny-server/templates/ingress.yaml @@ -8,7 +8,7 @@ metadata: spec: ingressClassName: {{ .Values.ingress.className | quote }} rules: - - host: {{ .Values.ingress.hostname | replace "_" "-" | replace "--" "-" | quote }} + - host: {{ include "chart.hostnameCleaned" . }} http: paths: - path: /