This is an automated email from the ASF dual-hosted git repository.
bugraoz93 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 e5a89f13ba1 Remove deprecated ingress options from chart (#68043)
e5a89f13ba1 is described below
commit e5a89f13ba1da0576e5e9cec13d81f73dd4718d8
Author: Jens Scheffler <[email protected]>
AuthorDate: Wed Jun 10 21:38:41 2026 +0200
Remove deprecated ingress options from chart (#68043)
* Remove deprecated ingress options from chart
* Rename newsfragment
* Apply suggestions from Miretpl
Co-authored-by: Przemysław Mirowski
<[email protected]>
* Restore test, fix bracket
* Optimize schema based on feedback
---------
Co-authored-by: Przemysław Mirowski
<[email protected]>
---
chart/newsfragments/68043.significant.rst | 12 +
chart/templates/NOTES.txt | 94 +-----
chart/templates/api-server/api-server-ingress.yaml | 11 +-
chart/templates/flower/flower-ingress.yaml | 11 +-
chart/templates/pgbouncer/pgbouncer-ingress.yaml | 2 +-
chart/templates/statsd/statsd-ingress.yaml | 2 +-
.../airflow_aux/test_basic_helm_chart.py | 2 +-
.../helm_tests/apiserver/test_ingress_apiserver.py | 95 +-----
chart/values.schema.json | 339 +++++++--------------
chart/values.yaml | 44 ---
10 files changed, 139 insertions(+), 473 deletions(-)
diff --git a/chart/newsfragments/68043.significant.rst
b/chart/newsfragments/68043.significant.rst
new file mode 100644
index 00000000000..649ad48ae71
--- /dev/null
+++ b/chart/newsfragments/68043.significant.rst
@@ -0,0 +1,12 @@
+Deprecated elements from ``ingress`` have been removed.
+
+* ``ingress.enabled`` has been replaced. There are now separate flags to
control the API server and
+ flower individually, ``ingress.web.enabled`` and ``ingress.flower.enabled``.
+* ``ingress.apiServer.host`` has been renamed to ``ingress.apiServer.hosts``
and is now an array.
+* ``ingress.apiServer.tls`` has been renamed to
``ingress.apiServer.hosts[*].tls`` and can be set per host.
+* ``ingress.web.host`` has been renamed to ``ingress.web.hosts`` and is now an
array.
+* ``ingress.web.tls`` has been renamed to ``ingress.web.hosts[*].tls`` and can
be set per host.
+* ``ingress.flower.host`` has been renamed to ``ingress.flower.hosts`` and is
now an array.
+* ``ingress.flower.tls`` has been renamed to ``ingress.flower.hosts[*].tls``
and can be set per host.
+* ``ingress.statsd.host`` has been renamed to ``ingress.statsd.hosts`` and is
now an array.
+* ``ingress.pgbouncer.host`` has been renamed to ``ingress.pgbouncer.hosts``
and is now an array.
diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt
index 38be615f118..56b374ca04d 100644
--- a/chart/templates/NOTES.txt
+++ b/chart/templates/NOTES.txt
@@ -22,62 +22,18 @@ Thank you for installing Apache {{ title .Chart.Name }} {{
.Values.airflowVersio
Your release is named {{ .Release.Name }}.
-{{- if or .Values.ingress.web.enabled .Values.ingress.flower.enabled
.Values.ingress.enabled }}
+{{- if or .Values.ingress.web.enabled .Values.ingress.flower.enabled }}
You can now access your service(s) by following defined Ingress urls:
-{{- if .Values.ingress.web.host }}
-
-DEPRECATION WARNING:
- `ingress.web.host` has been renamed to `ingress.web.hosts` and is now an
array.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- if .Values.ingress.web.tls }}
-
-DEPRECATION WARNING:
- `ingress.web.tls` has been renamed to `ingress.web.hosts[*].tls` and can be
set per host.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- if .Values.ingress.flower.host }}
-
-DEPRECATION WARNING:
- `ingress.flower.host` has been renamed to `ingress.flower.hosts` and is now
an array.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-
-{{- if .Values.ingress.flower.tls }}
-
-DEPRECATION WARNING:
- `ingress.flower.tls` has been renamed to `ingress.flower.hosts[*].tls` and
can be set per host.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- if .Values.ingress.enabled }}
-
-DEPRECATION WARNING:
- `ingress.enabled` has been deprecated. There are now separate flags to
control the webserver and
- flower individually, ``ingress.web.enabled`` and ``ingress.flower.enabled``.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- if and (or .Values.ingress.flower.enabled .Values.ingress.enabled)
(contains "CeleryExecutor" .Values.executor) }}
+{{- if and .Values.ingress.flower.enabled (contains "CeleryExecutor"
.Values.executor) }}
Flower Dashboard:
-{{- range .Values.ingress.flower.hosts | default (list
.Values.ingress.flower.host) }}
- {{- $tlsEnabled := $.Values.ingress.flower.tls.enabled -}}
- {{- $hostname := $.Values.ingress.flower.host -}}
+{{- range .Values.ingress.flower.hosts }}
{{- $path := $.Values.ingress.flower.path -}}
+ {{- $hostname := "" -}}
+ {{- $tlsEnabled := false -}}
{{- if . | kindIs "string" | not }}
- {{- $hostname = .name -}}
- {{- if .tls }}
- {{- $tlsEnabled = .tls.enabled -}}
- {{- end }}
+ {{- $hostname := .name -}}
+ {{- $tlsEnabled := (and .tls .tls.enabled) -}}
{{- end }}
http{{ if $tlsEnabled }}s{{ end }}://{{ (tpl $hostname $) }}{{ $path
}}{{ if (hasSuffix "/" $path) | not }}/{{ end }}
{{- end }}
@@ -94,42 +50,6 @@ Flower Dashboard: kubectl port-forward svc/{{ include
"airflow.fullname" .
{{- end }}
{{- end }}
-{{- if or .Values.ingress.apiServer.enabled .Values.ingress.enabled }}
-
-{{- if .Values.ingress.apiServer.host }}
-
-DEPRECATION WARNING:
- `ingress.apiServer.host` has been renamed to `ingress.apiServer.hosts` and
is now an array.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- if .Values.ingress.apiServer.tls.enabled }}
-
-DEPRECATION WARNING:
- `ingress.apiServer.tls` has been renamed to
`ingress.apiServer.hosts[*].tls` and can be set per host.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- end }}
-
-{{- if and .Values.ingress.statsd.enabled .Values.ingress.statsd.host }}
-
-DEPRECATION WARNING:
- `ingress.statsd.host` has been renamed to `ingress.statsd.hosts` and is now
an array.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
-{{- if and .Values.ingress.pgbouncer.enabled .Values.ingress.pgbouncer.host }}
-
-DEPRECATION WARNING:
- `ingress.pgbouncer.host` has been renamed to `ingress.pgbouncer.hosts` and
is now an array.
- Please change your values as support for the old name will be dropped in a
future release.
-
-{{- end }}
-
{{- if .Values.createUserJob.enabled }}
Default user (Airflow UI) Login credentials:
username: {{ .Values.createUserJob.defaultUser.username }}
diff --git a/chart/templates/api-server/api-server-ingress.yaml
b/chart/templates/api-server/api-server-ingress.yaml
index 1824eb6c497..5fa88245cc0 100644
--- a/chart/templates/api-server/api-server-ingress.yaml
+++ b/chart/templates/api-server/api-server-ingress.yaml
@@ -20,7 +20,7 @@
################################
## Airflow API Server Ingress
#################################
-{{- if and .Values.apiServer.enabled (or .Values.ingress.apiServer.enabled
.Values.ingress.enabled) }}
+{{- if and .Values.apiServer.enabled .Values.ingress.apiServer.enabled }}
{{- $fullname := include "airflow.fullname" . }}
apiVersion: networking.k8s.io/v1
kind: Ingress
@@ -56,16 +56,9 @@ spec:
{{- end }}
{{- end }}
{{- end }}
- {{- else if .Values.ingress.apiServer.tls.enabled }}
- tls:
- - hosts:
- {{- range .Values.ingress.apiServer.hosts | default (list
.Values.ingress.apiServer.host) }}
- - {{ tpl . $ | quote }}
- {{- end }}
- secretName: {{ .Values.ingress.apiServer.tls.secretName }}
{{- end }}
rules:
- {{- range .Values.ingress.apiServer.hosts | default (list
.Values.ingress.apiServer.host) }}
+ {{- range .Values.ingress.apiServer.hosts | default (list "") }}
- http:
paths:
{{- range $.Values.ingress.apiServer.precedingPaths }}
diff --git a/chart/templates/flower/flower-ingress.yaml
b/chart/templates/flower/flower-ingress.yaml
index 96de311a3fd..80bddd1441e 100644
--- a/chart/templates/flower/flower-ingress.yaml
+++ b/chart/templates/flower/flower-ingress.yaml
@@ -21,7 +21,7 @@
## Airflow Flower Ingress
#########################
{{- if .Values.flower.enabled }}
-{{- if and (or .Values.ingress.flower.enabled .Values.ingress.enabled)
(contains "CeleryExecutor" .Values.executor) }}
+{{- if and .Values.ingress.flower.enabled (contains "CeleryExecutor"
.Values.executor) }}
{{- $fullname := include "airflow.fullname" . }}
apiVersion: networking.k8s.io/v1
kind: Ingress
@@ -57,16 +57,9 @@ spec:
{{- end }}
{{- end }}
{{- end }}
- {{- else if .Values.ingress.flower.tls.enabled }}
- tls:
- - hosts:
- {{- range .Values.ingress.flower.hosts | default (list
.Values.ingress.flower.host) }}
- - {{ tpl . $ | quote }}
- {{- end }}
- secretName: {{ .Values.ingress.flower.tls.secretName }}
{{- end }}
rules:
- {{- range .Values.ingress.flower.hosts | default (list
.Values.ingress.flower.host) }}
+ {{- range .Values.ingress.flower.hosts | default (list "") }}
- http:
paths:
- backend:
diff --git a/chart/templates/pgbouncer/pgbouncer-ingress.yaml
b/chart/templates/pgbouncer/pgbouncer-ingress.yaml
index 0ad1f88c3d4..58675cf5dee 100644
--- a/chart/templates/pgbouncer/pgbouncer-ingress.yaml
+++ b/chart/templates/pgbouncer/pgbouncer-ingress.yaml
@@ -58,7 +58,7 @@ spec:
{{- end }}
{{- end }}
rules:
- {{- range .Values.ingress.pgbouncer.hosts | default (list
.Values.ingress.pgbouncer.host) }}
+ {{- range .Values.ingress.pgbouncer.hosts | default (list "") }}
- http:
paths:
- backend:
diff --git a/chart/templates/statsd/statsd-ingress.yaml
b/chart/templates/statsd/statsd-ingress.yaml
index 14386d6f3d5..a87bbcc8362 100644
--- a/chart/templates/statsd/statsd-ingress.yaml
+++ b/chart/templates/statsd/statsd-ingress.yaml
@@ -59,7 +59,7 @@ spec:
{{- end }}
{{- end }}
rules:
- {{- range .Values.ingress.statsd.hosts | default (list
.Values.ingress.statsd.host) }}
+ {{- range .Values.ingress.statsd.hosts | default (list "") }}
- http:
paths:
- backend:
diff --git a/chart/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
b/chart/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
index 3d1dbfe38b0..a89e57d6135 100644
--- a/chart/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
+++ b/chart/tests/helm_tests/airflow_aux/test_basic_helm_chart.py
@@ -227,7 +227,7 @@ class TestBaseChartTest:
},
"pgbouncer": {"enabled": True},
"redis": {"enabled": True},
- "ingress": {"enabled": True},
+ "ingress": {"flower": {"enabled": True}, "apiServer": {"enabled":
True}},
"networkPolicies": {"enabled": True},
"cleanup": {"enabled": True},
"databaseCleanup": {"enabled": True},
diff --git a/chart/tests/helm_tests/apiserver/test_ingress_apiserver.py
b/chart/tests/helm_tests/apiserver/test_ingress_apiserver.py
index 9652202cc0b..39895513d1b 100644
--- a/chart/tests/helm_tests/apiserver/test_ingress_apiserver.py
+++ b/chart/tests/helm_tests/apiserver/test_ingress_apiserver.py
@@ -48,77 +48,6 @@ class TestIngressAPIServer:
)
assert jmespath.search("spec.ingressClassName", docs[0]) == "foo"
- def test_should_ingress_hosts_objs_have_priority_over_host(self):
- docs = render_chart(
- values={
- "ingress": {
- "apiServer": {
- "enabled": True,
- "tls": {"enabled": True, "secretName": "oldsecret"},
- "hosts": [
- {"name": "*.a-host", "tls": {"enabled": True,
"secretName": "newsecret1"}},
- {"name": "b-host", "tls": {"enabled": True,
"secretName": "newsecret2"}},
- {"name": "c-host", "tls": {"enabled": True,
"secretName": "newsecret1"}},
- {"name": "d-host", "tls": {"enabled": False,
"secretName": ""}},
- {"name": "e-host"},
- ],
- "host": "old-host",
- },
- },
- },
- show_only=["templates/api-server/api-server-ingress.yaml"],
- )
- assert jmespath.search("spec.rules[*].host", docs[0]) == [
- "*.a-host",
- "b-host",
- "c-host",
- "d-host",
- "e-host",
- ]
- assert jmespath.search("spec.tls[*]", docs[0]) == [
- {"hosts": ["*.a-host"], "secretName": "newsecret1"},
- {"hosts": ["b-host"], "secretName": "newsecret2"},
- {"hosts": ["c-host"], "secretName": "newsecret1"},
- ]
-
- def test_should_ingress_hosts_strs_have_priority_over_host(self):
- docs = render_chart(
- values={
- "ingress": {
- "apiServer": {
- "enabled": True,
- "tls": {"enabled": True, "secretName": "secret"},
- "hosts": ["*.a-host", "b-host", "c-host", "d-host"],
- "host": "old-host",
- },
- },
- },
- show_only=["templates/api-server/api-server-ingress.yaml"],
- )
- assert jmespath.search("spec.rules[*].host", docs[0]) == ["*.a-host",
"b-host", "c-host", "d-host"]
- assert jmespath.search("spec.tls[*]", docs[0]) == [
- {"hosts": ["*.a-host", "b-host", "c-host", "d-host"],
"secretName": "secret"}
- ]
-
- def test_should_ingress_deprecated_host_and_top_level_tls_still_work(self):
- docs = render_chart(
- values={
- "ingress": {
- "apiServer": {
- "enabled": True,
- "tls": {"enabled": True, "secretName": "supersecret"},
- "host": "old-host",
- },
- },
- },
- show_only=["templates/api-server/api-server-ingress.yaml"],
- )
- assert (
- ["old-host"]
- == jmespath.search("spec.rules[*].host", docs[0])
- == jmespath.search("spec.tls[0].hosts", docs[0])
- )
-
def test_should_ingress_host_entry_not_exist(self):
docs = render_chart(
values={
@@ -133,32 +62,24 @@ class TestIngressAPIServer:
assert not jmespath.search("spec.rules[*].host", docs[0])
@pytest.mark.parametrize(
- ("global_value", "api_server_value", "expected"),
+ ("api_server_value", "expected"),
[
- (None, None, False),
- (None, False, False),
- (None, True, True),
- (False, None, False),
- (True, None, True),
- (False, True, True), # We will deploy it if _either_ are true
- (True, False, True),
+ (None, False),
+ (False, False),
+ (True, True),
],
)
- def test_ingress_created(self, global_value, api_server_value, expected):
- values = {"ingress": {}}
- if global_value is not None:
- values["ingress"]["enabled"] = global_value
+ def test_ingress_created(self, api_server_value, expected):
+ values = {}
if api_server_value is not None:
- values["ingress"]["apiServer"] = {"enabled": api_server_value}
- if values["ingress"] == {}:
- del values["ingress"]
+ values["ingress"] = {"apiServer": {"enabled": api_server_value}}
docs = render_chart(values=values,
show_only=["templates/api-server/api-server-ingress.yaml"])
assert expected == (len(docs) == 1)
def test_should_add_component_specific_labels(self):
docs = render_chart(
values={
- "ingress": {"enabled": True},
+ "ingress": {"apiServer": {"enabled": True}},
"apiServer": {
"labels": {"test_label": "test_label_value"},
},
diff --git a/chart/values.schema.json b/chart/values.schema.json
index 25ba415d1f8..935f33d0b7f 100644
--- a/chart/values.schema.json
+++ b/chart/values.schema.json
@@ -268,14 +268,6 @@
"type": "object",
"x-docsSection": "Ingress",
"properties": {
- "enabled": {
- "description": "Enable all ingress resources (deprecated -
use ingress.web.enabled and ingress.flower.enabled).",
- "type": [
- "boolean",
- "null"
- ],
- "default": null
- },
"apiServer": {
"description": "Configuration for the Ingress of the API
server.",
"type": "object",
@@ -304,53 +296,39 @@
"type": "string",
"default": "ImplementationSpecific"
},
- "host": {
- "description": "The hostname for the API server
Ingress. (Deprecated - renamed to `ingress.apiServer.hosts`)",
- "type": "string",
- "default": ""
- },
"hosts": {
"description": "The hostnames or hosts
configuration for the API server Ingress.",
"type": "array",
"default": [],
"items": {
- "oneOf": [
- {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "description": "The hostname for the
API server Ingress.",
+ "type": "string",
+ "default": ""
+ },
+ "tls": {
+ "description": "Configuration for API
server Ingress TLS.",
"type": "object",
"additionalProperties": false,
"properties": {
- "name": {
- "description": "The hostname
for the API server Ingress.",
+ "enabled": {
+ "description": "Enable TLS
termination for the API server Ingress.",
+ "type": "boolean",
+ "default": false
+ },
+ "secretName": {
+ "description": "The name of a
pre-created Secret containing a TLS private key and certificate.",
"type": "string",
"default": ""
- },
- "tls": {
- "description": "Configuration
for API server Ingress TLS.",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable
TLS termination for the API server Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The
name of a pre-created Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
}
- },
- "required": [
- "name"
- ]
- },
- {
- "type": "string",
- "default": "",
- "$comment": "Deprecated by object
above"
+ }
}
+ },
+ "required": [
+ "name"
]
}
},
@@ -359,23 +337,6 @@
"type": "string",
"default": ""
},
- "tls": {
- "description": "Configuration for API server
Ingress TLS. (Deprecated - renamed to `ingress.apiServer.hosts[*].tls`)",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable TLS termination for
the API server Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The name of a pre-created
Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
- },
"precedingPaths": {
"description": "HTTP paths to add to the API
server Ingress before the default path.",
"type": "array",
@@ -416,53 +377,39 @@
"type": "string",
"default": "ImplementationSpecific"
},
- "host": {
- "description": "The hostname for the web Ingress.
(Deprecated - renamed to `ingress.web.hosts`)",
- "type": "string",
- "default": ""
- },
"hosts": {
"description": "The hostnames or hosts
configuration for the web Ingress.",
"type": "array",
"default": [],
"items": {
- "oneOf": [
- {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "description": "The hostname for the
web Ingress.",
+ "type": "string",
+ "default": ""
+ },
+ "tls": {
+ "description": "Configuration for web
Ingress TLS.",
"type": "object",
"additionalProperties": false,
"properties": {
- "name": {
- "description": "The hostname
for the web Ingress.",
+ "enabled": {
+ "description": "Enable TLS
termination for the web Ingress.",
+ "type": "boolean",
+ "default": false
+ },
+ "secretName": {
+ "description": "The name of a
pre-created Secret containing a TLS private key and certificate.",
"type": "string",
"default": ""
- },
- "tls": {
- "description": "Configuration
for web Ingress TLS.",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable
TLS termination for the web Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The
name of a pre-created Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
}
- },
- "required": [
- "name"
- ]
- },
- {
- "type": "string",
- "default": "",
- "$comment": "Deprecated by object
above"
+ }
}
+ },
+ "required": [
+ "name"
]
}
},
@@ -471,23 +418,6 @@
"type": "string",
"default": ""
},
- "tls": {
- "description": "Configuration for web Ingress TLS.
(Deprecated - renamed to `ingress.web.hosts[*].tls`)",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable TLS termination for
the web Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The name of a pre-created
Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
- },
"precedingPaths": {
"description": "HTTP paths to add to the web
Ingress before the default path.",
"type": "array",
@@ -528,53 +458,39 @@
"type": "string",
"default": "ImplementationSpecific"
},
- "host": {
- "description": "The hostname for the flower
Ingress. (Deprecated - renamed to `ingress.flower.hosts`)",
- "type": "string",
- "default": ""
- },
"hosts": {
"description": "The hostnames or hosts
configuration for the flower Ingress.",
"type": "array",
"default": [],
"items": {
- "oneOf": [
- {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "description": "The hostname for the
web Ingress.",
+ "type": "string",
+ "default": ""
+ },
+ "tls": {
+ "description": "Configuration for web
Ingress TLS.",
"type": "object",
"additionalProperties": false,
"properties": {
- "name": {
- "description": "The hostname
for the web Ingress.",
+ "enabled": {
+ "description": "Enable TLS
termination for the web Ingress.",
+ "type": "boolean",
+ "default": false
+ },
+ "secretName": {
+ "description": "The name of a
pre-created Secret containing a TLS private key and certificate.",
"type": "string",
"default": ""
- },
- "tls": {
- "description": "Configuration
for web Ingress TLS.",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable
TLS termination for the web Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The
name of a pre-created Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
}
- },
- "required": [
- "name"
- ]
- },
- {
- "type": "string",
- "default": "",
- "$comment": "Deprecated by object
above"
+ }
}
+ },
+ "required": [
+ "name"
]
}
},
@@ -582,23 +498,6 @@
"description": "The Ingress Class for the flower
Ingress.",
"type": "string",
"default": ""
- },
- "tls": {
- "description": "Configuration for flower Ingress
TLS. (Deprecated - renamed to `ingress.flower.hosts[*].tls`)",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable TLS termination for
the flower Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The name of a pre-created
Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
}
}
},
@@ -630,53 +529,39 @@
"type": "string",
"default": "ImplementationSpecific"
},
- "host": {
- "description": "The hostname for the statsd
Ingress. (Deprecated - renamed to `ingress.statsd.hosts`)",
- "type": "string",
- "default": ""
- },
"hosts": {
"description": "The hostnames or hosts
configuration for the statsd Ingress.",
"type": "array",
"default": [],
"items": {
- "oneOf": [
- {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "description": "The hostname for the
web Ingress.",
+ "type": "string",
+ "default": ""
+ },
+ "tls": {
+ "description": "Configuration for web
Ingress TLS.",
"type": "object",
"additionalProperties": false,
"properties": {
- "name": {
- "description": "The hostname
for the web Ingress.",
+ "enabled": {
+ "description": "Enable TLS
termination for the web Ingress.",
+ "type": "boolean",
+ "default": false
+ },
+ "secretName": {
+ "description": "The name of a
pre-created Secret containing a TLS private key and certificate.",
"type": "string",
"default": ""
- },
- "tls": {
- "description": "Configuration
for web Ingress TLS.",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable
TLS termination for the web Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The
name of a pre-created Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
}
- },
- "required": [
- "name"
- ]
- },
- {
- "type": "string",
- "default": "",
- "$comment": "Deprecated by object
above"
+ }
}
+ },
+ "required": [
+ "name"
]
}
},
@@ -715,53 +600,39 @@
"type": "string",
"default": "ImplementationSpecific"
},
- "host": {
- "description": "The hostname for the PgBouncer
Ingress. (Deprecated - renamed to `ingress.pgbouncer.hosts`)",
- "type": "string",
- "default": ""
- },
"hosts": {
"description": "The hostnames or hosts
configuration for the PgBouncer Ingress.",
"type": "array",
"default": [],
"items": {
- "oneOf": [
- {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "description": "The hostname for the
web Ingress.",
+ "type": "string",
+ "default": ""
+ },
+ "tls": {
+ "description": "Configuration for web
Ingress TLS.",
"type": "object",
"additionalProperties": false,
"properties": {
- "name": {
- "description": "The hostname
for the web Ingress.",
+ "enabled": {
+ "description": "Enable TLS
termination for the web Ingress.",
+ "type": "boolean",
+ "default": false
+ },
+ "secretName": {
+ "description": "The name of a
pre-created Secret containing a TLS private key and certificate.",
"type": "string",
"default": ""
- },
- "tls": {
- "description": "Configuration
for web Ingress TLS.",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "description": "Enable
TLS termination for the web Ingress.",
- "type": "boolean",
- "default": false
- },
- "secretName": {
- "description": "The
name of a pre-created Secret containing a TLS private key and certificate.",
- "type": "string",
- "default": ""
- }
- }
}
- },
- "required": [
- "name"
- ]
- },
- {
- "type": "string",
- "default": "",
- "$comment": "Deprecated by object
above"
+ }
}
+ },
+ "required": [
+ "name"
]
}
},
diff --git a/chart/values.yaml b/chart/values.yaml
index b8960c2c9bc..c70d841aeca 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -146,14 +146,6 @@ imagePullSecrets: []
# Ingress configuration
ingress:
- # Enable all ingress resources
- # (deprecated, use
- # `ingress.web.enabled`,
- # `ingress.apiServer.enabled` and/or
- # `ingress.flower.enabled`
- # instead)
- enabled: ~
-
# Configs for the Ingress of the API Server (Airflow 3+)
apiServer:
# Enable API Server ingress resource
@@ -168,9 +160,6 @@ ingress:
# The pathType for the above path
pathType: "ImplementationSpecific"
- # The hostname for the API Server Ingress (deprecated, use
`ingress.apiServer.hosts` instead)
- host: ""
-
# The hostnames or hosts configuration for the API Server Ingress
(templated)
hosts: []
# - name: ""
@@ -184,13 +173,6 @@ ingress:
# The Ingress Class for the API Server Ingress
ingressClassName: ""
- # Configs for API Server Ingress TLS (deprecated, use
`ingress.apiServer.hosts[*].tls` instead)
- tls:
- # Enable TLS termination for the API Server Ingress
- enabled: false
- # The name of a pre-created Secret containing a TLS private key and
certificate
- secretName: ""
-
# HTTP paths to add to the API Server Ingress before the default path
precedingPaths: []
@@ -211,9 +193,6 @@ ingress:
# The pathType for the above path
pathType: "ImplementationSpecific"
- # The hostname for the web Ingress (deprecated, use `ingress.web.hosts`
instead)
- host: ""
-
# The hostnames or hosts configuration for the web Ingress (templated)
hosts: []
# - name: ""
@@ -227,13 +206,6 @@ ingress:
# The Ingress Class for the web Ingress
ingressClassName: ""
- # Configs for web Ingress TLS (deprecated, use `ingress.web.hosts[*].tls`
instead)
- tls:
- # Enable TLS termination for the web Ingress
- enabled: false
- # The name of a pre-created Secret containing a TLS private key and
certificate
- secretName: ""
-
# HTTP paths to add to the web Ingress before the default path
precedingPaths: []
@@ -254,9 +226,6 @@ ingress:
# The pathType for the above path
pathType: "ImplementationSpecific"
- # The hostname for the flower Ingress (deprecated, use
`ingress.flower.hosts` instead)
- host: ""
-
# The hostnames or hosts configuration for the flower Ingress (templated)
hosts: []
# - name: ""
@@ -269,13 +238,6 @@ ingress:
# The Ingress Class for the flower Ingress
ingressClassName: ""
- # Configs for flower Ingress TLS (deprecated, use
`ingress.flower.hosts[*].tls` instead)
- tls:
- # Enable TLS termination for the flower Ingress
- enabled: false
- # The name of a pre-created Secret containing a TLS private key and
certificate
- secretName: ""
-
# Configs for the Ingress of the StatsD Service
statsd:
# Enable web ingress resource
@@ -290,9 +252,6 @@ ingress:
# The pathType for the above path
pathType: "ImplementationSpecific"
- # The hostname for the StatsD Ingress (deprecated, use
`ingress.statsd.hosts` instead)
- host: ""
-
# The hostnames or hosts configuration for the StatsD Ingress (templated)
hosts: []
# - name: ""
@@ -319,9 +278,6 @@ ingress:
# The pathType for the above path
pathType: "ImplementationSpecific"
- # The hostname for the PgBouncer Ingress (deprecated, use
`ingress.pgbouncer.hosts` instead)
- host: ""
-
# The hostnames or hosts configuration for the PgBouncer Ingress
(templated)
hosts: []
# - name: ""
