fix(backstage): correctly render lightspeed image fields regardless if they are string or map [RHDHBUGS-3091] (#385)

Author: rm3l

charts/backstage/Chart.yaml

@@ -47,4 +47,4 @@ sources: []
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # Note that when this chart is published to https://github.com/openshift-helm-charts/charts
 # it will follow the RHDH versioning 1.y.z
-version: 5.11.0
+version: 5.11.1

charts/backstage/README.md

@@ -1,7 +1,7 @@
 
 # RHDH Backstage Helm Chart for OpenShift
 
-![Version: 5.11.0](https://img.shields.io/badge/Version-5.11.0-informational?style=flat-square)
+![Version: 5.11.1](https://img.shields.io/badge/Version-5.11.1-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for deploying Red Hat Developer Hub, which is a Red Hat supported version of Backstage.
@@ -29,7 +29,7 @@ For the **Generally Available** version of this chart, see:
 helm repo add bitnami https://charts.bitnami.com/bitnami
 helm repo add redhat-developer https://redhat-developer.github.io/rhdh-chart
 
-helm install my-backstage redhat-developer/backstage --version 5.11.0
+helm install my-backstage redhat-developer/backstage --version 5.11.1
 ```
 
 ## Introduction

charts/backstage/templates/_helpers.tpl

@@ -49,6 +49,17 @@ Referenced from: https://github.com/bitnami/charts/blob/main/bitnami/postgresql/
     {{- end -}}
 {{- end -}}
 
+{{/*
+Return an image reference from a value that may be a string or a map with registry/repository/tag fields.
+*/}}
+{{- define "backstage.image.render" -}}
+{{- if kindIs "string" .image -}}
+  {{- .image -}}
+{{- else -}}
+  {{- include "common.images.image" (dict "imageRoot" (.image | toYaml | fromYaml) "global" .global) -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return the configured Lightspeed runtime volume type and validate the required
 source block is present.

charts/backstage/vendor/backstage/charts/backstage/templates/backstage-deployment.yaml

@@ -131,7 +131,7 @@ spec:
         {{- end }}
         {{- if $lightspeed.enabled }}
         - name: {{ $lightspeed.initContainer.name }}
-          image: {{ include "common.tplvalues.render" (dict "value" $lightspeed.initContainer.image "context" $) }}
+          image: {{ include "backstage.image.render" (dict "image" $lightspeed.initContainer.image "global" .Values.global) | quote }}
           imagePullPolicy: {{ $lightspeed.initContainer.imagePullPolicy | quote }}
           {{- if $lightspeed.initContainer.securityContext }}
           securityContext:
@@ -255,7 +255,7 @@ spec:
           {{- end }}
         {{- if $lightspeed.enabled }}
         - name: {{ $lightspeed.sidecar.name }}
-          image: {{ include "common.tplvalues.render" (dict "value" $lightspeed.sidecar.image "context" $) }}
+          image: {{ include "backstage.image.render" (dict "image" $lightspeed.sidecar.image "global" .Values.global) | quote }}
           imagePullPolicy: {{ $lightspeed.sidecar.imagePullPolicy | quote }}
           {{- if $lightspeed.sidecar.securityContext }}
           securityContext: