(airflow) branch main updated: Fix ingress notes (#59122)

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 7446e41feb5 Fix ingress notes (#59122)
7446e41feb5 is described below

commit 7446e41feb5a81fed7c9a626183c5308e204ad47
Author: Przemysław Mirowski <mire...@gmail.com>
AuthorDate: Sun Dec 7 23:00:52 2025 +0100

    Fix ingress notes (#59122)
---
 chart/templates/NOTES.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index e6da264c3d0..75f04fe9873 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -67,32 +67,34 @@ DEPRECATION WARNING:
 
 {{- end }}
 
-{{- if or .Values.ingress.web.enabled .Values.ingress.enabled }}
+{{- if and .Values.webserver.enabled (or .Values.ingress.web.enabled 
.Values.ingress.enabled) }}
 Airflow Webserver:
 {{- range .Values.ingress.web.hosts | default (list .Values.ingress.web.host) 
}}
       {{- $tlsEnabled := $.Values.ingress.web.tls.enabled -}}
       {{- $hostname := $.Values.ingress.web.host -}}
+      {{- $path := $.Values.ingress.web.path -}}
       {{- if . | kindIs "string" | not }}
+      {{- $hostname = .name -}}
       {{- if .tls }}
       {{- $tlsEnabled = .tls.enabled -}}
-      {{- $hostname = .name -}}
       {{- end }}
       {{- end }}
-      http{{ if $tlsEnabled }}s{{ end }}://{{ (tpl $hostname $) }}{{ 
$.Values.ingress.web.path }}/
+      http{{ if $tlsEnabled }}s{{ end }}://{{ (tpl $hostname $) }}{{ $path 
}}{{ if (hasSuffix "/" $path) | not }}/{{ end }}
 {{- end }}
 {{- end }}
 {{- if and (or .Values.ingress.flower.enabled .Values.ingress.enabled) (or 
(contains "CeleryExecutor" .Values.executor) (contains 
"CeleryKubernetesExecutor" .Values.executor)) }}
-Flower dashboard:
+Flower Dashboard:
 {{- range .Values.ingress.flower.hosts | default (list 
.Values.ingress.flower.host) }}
       {{- $tlsEnabled := $.Values.ingress.flower.tls.enabled -}}
       {{- $hostname := $.Values.ingress.flower.host -}}
+      {{- $path := $.Values.ingress.flower.path -}}
       {{- if . | kindIs "string" | not }}
+      {{- $hostname = .name -}}
       {{- if .tls }}
       {{- $tlsEnabled = .tls.enabled -}}
-      {{- $hostname = .name -}}
       {{- end }}
       {{- end }}
-      http{{ if $tlsEnabled }}s{{ end }}://{{ (tpl $hostname $) }}{{ 
$.Values.ingress.flower.path }}/
+      http{{ if $tlsEnabled }}s{{ end }}://{{ (tpl $hostname $) }}{{ $path 
}}{{ if (hasSuffix "/" $path) | not }}/{{ end }}
 {{- end }}
 {{- end }}
 {{- else }}
@@ -106,8 +108,7 @@ Airflow API Server:     kubectl port-forward svc/{{ include 
"airflow.fullname" .
 
 {{- if .Values.flower.enabled }}
 {{- if or (contains "CeleryExecutor" .Values.executor) (contains 
"CeleryKubernetesExecutor" .Values.executor)}}
-Flower dashboard:      kubectl port-forward svc/{{ include "airflow.fullname" 
. }}-flower {{ .Values.ports.flowerUI }}:{{ .Values.ports.flowerUI }} 
--namespace {{ .Release.Namespace }}
-
+Flower Dashboard:      kubectl port-forward svc/{{ include "airflow.fullname" 
. }}-flower {{ .Values.ports.flowerUI }}:{{ .Values.ports.flowerUI }} 
--namespace {{ .Release.Namespace }}
 {{- end }}
 {{- end }}
 {{- end }}