fix: Fixing Helm chart flower ingress service reference

chart/templates/flower/flower-ingress.yaml

@@ -22,10 +22,11 @@
 #################################
 {{- if .Values.flower.enabled }}
 {{- if and (or .Values.ingress.flower.enabled .Values.ingress.enabled) (or (eq .Values.executor "CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor")) }}
+{{- $fullname := (include "airflow.fullname" .) }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "airflow.fullname" . }}-flower-ingress
+  name: {{ $fullname }}-flower-ingress
   labels:
     tier: airflow
     component: flower-ingress
@@ -72,7 +73,7 @@ spec:
         paths:
           - backend:
               service:
-                name: {{ $.Release.Name }}-flower
+                name: {{ $fullname }}-flower
                 port:
                   name: flower-ui
             {{- if $.Values.ingress.flower.path }}

helm_tests/webserver/test_ingress_flower.py

@@ -220,3 +220,28 @@ def test_can_ingress_hosts_be_templated(self):
             "cc.example.com",
             "dd.example.com",
         ] == jmespath.search("spec.rules[*].host", docs[0])
+
+    def test_backend_service_name(self):
+        docs = render_chart(
+            values={"ingress": {"enabled": True}, "flower": {"enabled": True}},
+            show_only=["templates/flower/flower-ingress.yaml"],
+        )
+
+        assert "release-name-flower" == jmespath.search(
+            "spec.rules[0].http.paths[0].backend.service.name", docs[0]
+        )
+
+    def test_backend_service_name_with_fullname_override(self):
+        docs = render_chart(
+            values={
+                "fullnameOverride": "test-basic",
+                "useStandardNaming": True,
+                "ingress": {"enabled": True},
+                "flower": {"enabled": True},
+            },
+            show_only=["templates/flower/flower-ingress.yaml"],
+        )
+
+        assert "test-basic-flower" == jmespath.search(
+            "spec.rules[0].http.paths[0].backend.service.name", docs[0]
+        )

helm_tests/webserver/test_ingress_web.py

@@ -200,3 +200,27 @@ def test_can_ingress_hosts_be_templated(self):
             "cc.example.com",
             "dd.example.com",
         ] == jmespath.search("spec.rules[*].host", docs[0])
+
+    def test_backend_service_name(self):
+        docs = render_chart(
+            values={"ingress": {"web": {"enabled": True}}},
+            show_only=["templates/webserver/webserver-ingress.yaml"],
+        )
+
+        assert "release-name-webserver" == jmespath.search(
+            "spec.rules[0].http.paths[0].backend.service.name", docs[0]
+        )
+
+    def test_backend_service_name_with_fullname_override(self):
+        docs = render_chart(
+            values={
+                "fullnameOverride": "test-basic",
+                "useStandardNaming": True,
+                "ingress": {"web": {"enabled": True}},
+            },
+            show_only=["templates/webserver/webserver-ingress.yaml"],
+        )
+
+        assert "test-basic-webserver" == jmespath.search(
+            "spec.rules[0].http.paths[0].backend.service.name", docs[0]
+        )