Copilot commented on code in PR #52199:
URL: https://github.com/apache/airflow/pull/52199#discussion_r3066492469
##########
chart/templates/_helpers.yaml:
##########
@@ -1126,3 +1126,14 @@ capabilities:
app: keda-operator
{{- end }}
{{- end }}
+
+{{- define "airflow.podDisruptionBudgetConfig" -}}
+ {{- $config := .config | default dict }}
+
+ {{- if $config.minAvailable }}
+ minAvailable: {{ $config.minAvailable }}
+ {{- end }}
+ {{- if or $config.maxUnavailable (not $config.minAvailable)}}
+ maxUnavailable: {{ $config.maxUnavailable | default 1 }}
+ {{- end }}
Review Comment:
The helper uses truthiness checks (`if $config.minAvailable` /
`$config.maxUnavailable`) to decide whether a value is set. This treats
explicit `0` as “unset” and will either omit the field or override it with the
default `1`, which is incorrect for valid PDB values like `0`. Consider using
key-presence checks (e.g., `hasKey`) and also explicitly enforcing mutual
exclusivity (fail fast or prefer `minAvailable` when both keys are present) to
avoid rendering invalid PDB specs.
##########
helm-tests/tests/helm_tests/other/test_pdb_pgbouncer.py:
##########
@@ -48,3 +48,17 @@ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param(self):
},
show_only=["templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml"],
) # checks that no validation exception is raised
+
+ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param_only(self):
+ render_chart(
+ values={
+ "pgbouncer": {
+ "enabled": True,
+ "podDisruptionBudget": {
+ "enabled": True,
+ "config": {"minAvailable": 1},
+ },
+ }
+ },
+
show_only=["templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml"],
+ ) # checks that no validation exception is raised
Review Comment:
This test only checks that `render_chart()` doesn’t raise, but the
JSON-schema validation used by `render_chart` may not catch the Kubernetes API
rule that `minAvailable` and `maxUnavailable` cannot both be set. To make the
regression test meaningful, assert on the rendered manifest (e.g., that
`spec.minAvailable` is present and `spec.maxUnavailable` is absent) for the
`minAvailable`-only case.
##########
helm-tests/tests/helm_tests/airflow_core/test_pdb_scheduler.py:
##########
@@ -62,3 +62,16 @@ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param(self):
},
show_only=["templates/scheduler/scheduler-poddisruptionbudget.yaml"],
) # checks that no validation exception is raised
+
+ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param_only(self):
+ render_chart(
+ values={
+ "scheduler": {
+ "podDisruptionBudget": {
+ "enabled": True,
+ "config": {"minAvailable": 1},
+ }
+ }
+ },
+
show_only=["templates/scheduler/scheduler-poddisruptionbudget.yaml"],
+ ) # checks that no validation exception is raised
Review Comment:
This test only checks that `render_chart()` doesn’t raise, but the
JSON-schema validation used by `render_chart` may not catch the Kubernetes API
rule that `minAvailable` and `maxUnavailable` cannot both be set. To make the
regression test meaningful, assert on the rendered manifest (e.g., that
`spec.minAvailable` is present and `spec.maxUnavailable` is absent) for the
`minAvailable`-only case.
##########
helm-tests/tests/helm_tests/webserver/test_pdb_webserver.py:
##########
@@ -62,3 +62,16 @@ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param(self):
},
show_only=["templates/webserver/webserver-poddisruptionbudget.yaml"],
) # checks that no validation exception is raised
+
+ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param_only(self):
+ render_chart(
+ values={
+ "webserver": {
+ "podDisruptionBudget": {
+ "enabled": True,
+ "config": {"minAvailable": 1},
+ }
+ }
+ },
+
show_only=["templates/webserver/webserver-poddisruptionbudget.yaml"],
+ ) # checks that no validation exception is raised
Review Comment:
This test only checks that `render_chart()` doesn’t raise, but the
JSON-schema validation used by `render_chart` may not catch the Kubernetes API
rule that `minAvailable` and `maxUnavailable` cannot both be set. To make the
regression test meaningful, assert on the rendered manifest (e.g., that
`spec.minAvailable` is present and `spec.maxUnavailable` is absent) for the
`minAvailable`-only case.
##########
helm-tests/tests/helm_tests/apiserver/test_pdb_apiserver.py:
##########
@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from chart_utils.helm_template_generator import render_chart
+
+
+class TestApiserverPdb:
+ """Tests api-server pdb."""
+
+ def test_should_pass_validation_with_just_pdb_enabled_v1(self):
+ render_chart(
+ values={"apiServer": {"podDisruptionBudget": {"enabled": True}}},
+
show_only=["templates/api-server/api-server-poddisruptionbudget.yaml"],
+ ) # checks that no validation exception is raised
+
+ def test_should_pass_validation_with_just_pdb_enabled_v1beta1(self):
+ render_chart(
+ values={"apiServer": {"podDisruptionBudget": {"enabled": True}}},
+
show_only=["templates/api-server/api-server-poddisruptionbudget.yaml"],
+ kubernetes_version="1.16.0",
+ ) # checks that no validation exception is raised
+
+ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param(self):
+ render_chart(
+ values={
+ "apiServer": {
+ "podDisruptionBudget": {
+ "enabled": True,
+ "config": {"maxUnavailable": None, "minAvailable": 1},
+ }
+ }
+ },
+
show_only=["templates/api-server/api-server-poddisruptionbudget.yaml"],
+ ) # checks that no validation exception is raised
+
+ def
test_should_pass_validation_with_pdb_enabled_and_min_available_param_only(self):
+ render_chart(
+ values={
+ "apiServer": {
+ "podDisruptionBudget": {
+ "enabled": True,
+ "config": {"minAvailable": 1},
+ }
+ }
+ },
+
show_only=["templates/api-server/api-server-poddisruptionbudget.yaml"],
+ ) # checks that no validation exception is raised
Review Comment:
These tests only check that `render_chart()` doesn’t raise, but the
JSON-schema validation used by `render_chart` may not catch the Kubernetes API
rule that `minAvailable` and `maxUnavailable` cannot both be set. To make the
regression test meaningful, assert on the rendered manifest (e.g., that
`spec.minAvailable` is present and `spec.maxUnavailable` is absent) for the
`minAvailable`-only case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
