Miretpl commented on code in PR #61018:
URL: https://github.com/apache/airflow/pull/61018#discussion_r2760702033
##########
helm-tests/tests/helm_tests/airflow_core/test_scheduler.py:
##########
@@ -530,39 +530,25 @@ def test_startupprobe_values_are_configurable(self):
"wow such test",
]
- @pytest.mark.parametrize(
- ("airflow_version", "probe_command"),
- [
- ("1.10.14", "from airflow.jobs.scheduler_job import SchedulerJob"),
- ("2.1.0", "airflow jobs check --job-type SchedulerJob --hostname
$(hostname)"),
- ("2.5.0", "airflow jobs check --job-type SchedulerJob --local"),
- ],
- )
- def test_livenessprobe_command_depends_on_airflow_version(self,
airflow_version, probe_command):
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
+ def test_livenessprobe_command_depends_on_airflow_version(self,
airflow_version):
Review Comment:
```suggestion
def test_livenessprobe_command(self, airflow_version):
```
it was, but it doesn't anymore 😄
##########
chart/values.yaml:
##########
@@ -74,6 +74,7 @@ defaultAirflowTag: "3.1.6"
defaultAirflowDigest: ~
Review Comment:
The following values will not be needed:
1. `config.core.colored_console_log` -> moved to `logging`
2. `config.core.remote_logging` -> moved to `logging`
3. `config.webserver.rbac` -> removed in 2.0 (based on the doc)
4. `config.scheduler.statsd_on` -> moved to `metrics`
5. `config.scheduler.statsd_port` -> moved to `metrics`
6. `config.scheduler.statsd_prefix` -> moved to `metrics`
7. `config.scheduler.statsd_host` -> moved to `metrics`
8. `config.scheduler.run_duration` -> removed in 2.0 (based on the doc)
9. `config.kubernetes` -> renamed to the `config.kubernetes_executor`
Desc to the below configs could be adjusted:
1. `ingress.web`
2. `data.metadataSecretName`
3. `scheduler.replicas`
Not all values under `enableBuiltInSecretEnvVars` will be needed.
##########
chart/templates/_helpers.yaml:
##########
@@ -113,7 +113,7 @@ If release name contains chart name it will be used as a
full name.
key: jwt-secret
Review Comment:
We could also adjust the `standard_airflow_environment` function
##########
helm-tests/tests/helm_tests/airflow_aux/test_configmap.py:
##########
@@ -54,11 +54,7 @@ def test_multiple_annotations(self):
("af_version", "secret_key", "secret_key_name", "expected"),
[
("3.0.0", None, None, False),
- ("2.2.0", None, None, True),
- ("2.2.0", "foo", None, False),
- ("2.2.0", None, "foo", False),
- ("2.1.3", None, None, False),
- ("2.1.3", "foo", None, False),
+ ("2.11.0", None, None, True),
Review Comment:
I guess we can simplify the test case if `secret_key` and `secret_key_name`
are always `None`
##########
helm-tests/tests/helm_tests/airflow_core/test_triggerer.py:
##########
@@ -25,21 +25,14 @@
class TestTriggerer:
"""Tests triggerer."""
- @pytest.mark.parametrize(
- ("airflow_version", "num_docs"),
- [
- ("2.1.0", 0),
- ("2.2.0", 1),
- ],
- )
- def test_only_exists_on_new_airflow_versions(self, airflow_version,
num_docs):
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
+ def test_only_exists_on_new_airflow_versions(self, airflow_version):
"""Trigger was only added from Airflow 2.2 onwards."""
Review Comment:
```suggestion
```
##########
helm-tests/tests/helm_tests/airflow_core/test_triggerer.py:
##########
@@ -491,8 +484,8 @@ def test_livenessprobe_values_are_configurable(self):
@pytest.mark.parametrize(
("airflow_version", "probe_command"),
[
- ("2.4.9", "airflow jobs check --job-type TriggererJob --hostname
$(hostname)"),
- ("2.5.0", "airflow jobs check --job-type TriggererJob --local"),
+ ("2.11.0", "airflow jobs check --job-type TriggererJob --local"),
+ ("3.0.0", "airflow jobs check --job-type TriggererJob --local"),
Review Comment:
`probe_command` is the same, so we can simplify this test case too
##########
chart/templates/triggerer/triggerer-deployment.yaml:
##########
@@ -20,10 +20,9 @@
################################
## Airflow Triggerer Deployment
#################################
-{{- if semverCompare ">=2.2.0" .Values.airflowVersion }}
{{- if .Values.triggerer.enabled }}
{{- /* Airflow version 2.6.0 is when triggerer logs serve introduced */ -}}
Review Comment:
```suggestion
```
##########
helm-tests/tests/helm_tests/airflow_core/test_worker.py:
##########
@@ -1053,9 +1031,8 @@ def test_kerberos_init_container_resources(self,
workers_values):
@pytest.mark.parametrize(
("airflow_version", "expected_arg"),
[
- ("1.10.14", "airflow worker"),
- ("2.0.2", "airflow celery worker"),
- ("2.1.0", "airflow celery worker"),
+ ("2.11.0", "airflow celery worker"),
+ ("3.0.0", "airflow celery worker"),
Review Comment:
The test case can be simplified, as we are expecting the same result
##########
helm-tests/tests/helm_tests/airflow_core/test_scheduler.py:
##########
@@ -530,39 +530,25 @@ def test_startupprobe_values_are_configurable(self):
"wow such test",
]
- @pytest.mark.parametrize(
- ("airflow_version", "probe_command"),
- [
- ("1.10.14", "from airflow.jobs.scheduler_job import SchedulerJob"),
- ("2.1.0", "airflow jobs check --job-type SchedulerJob --hostname
$(hostname)"),
- ("2.5.0", "airflow jobs check --job-type SchedulerJob --local"),
- ],
- )
- def test_livenessprobe_command_depends_on_airflow_version(self,
airflow_version, probe_command):
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
+ def test_livenessprobe_command_depends_on_airflow_version(self,
airflow_version):
docs = render_chart(
values={"airflowVersion": f"{airflow_version}"},
show_only=["templates/scheduler/scheduler-deployment.yaml"],
)
assert (
- probe_command
+ "airflow jobs check --job-type SchedulerJob --local"
in
jmespath.search("spec.template.spec.containers[0].livenessProbe.exec.command",
docs[0])[-1]
)
- @pytest.mark.parametrize(
- ("airflow_version", "probe_command"),
- [
- ("1.10.14", "from airflow.jobs.scheduler_job import SchedulerJob"),
- ("2.1.0", "airflow jobs check --job-type SchedulerJob --hostname
$(hostname)"),
- ("2.5.0", "airflow jobs check --job-type SchedulerJob --local"),
- ],
- )
- def test_startupprobe_command_depends_on_airflow_version(self,
airflow_version, probe_command):
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
+ def test_startupprobe_command_depends_on_airflow_version(self,
airflow_version):
Review Comment:
```suggestion
def test_startupprobe_command(self, airflow_version):
```
##########
helm-tests/tests/helm_tests/airflow_aux/test_configmap.py:
##########
@@ -54,11 +54,7 @@ def test_multiple_annotations(self):
("af_version", "secret_key", "secret_key_name", "expected"),
Review Comment:
The assert message in `test_execution_api_server_url` could be adjusted
##########
chart/templates/webserver/webserver-deployment.yaml:
##########
@@ -181,17 +174,15 @@ spec:
{{- end }}
resources: {{- toYaml .Values.webserver.resources | nindent 12 }}
volumeMounts:
- {{- if semverCompare ">=1.10.12" .Values.airflowVersion }}
- name: config
mountPath: {{ include "airflow_pod_template_file" .
}}/pod_template_file.yaml
subPath: pod_template_file.yaml
readOnly: true
- {{- end }}
{{- include "airflow_config_mount" . | nindent 12 }}
{{- if or .Values.webserver.webserverConfig
.Values.webserver.webserverConfigConfigMapName }}
{{- include "airflow_webserver_config_mount" . | nindent 12 }}
{{- end }}
- {{- if and (semverCompare "<2.0.0" .Values.airflowVersion) (or
.Values.dags.gitSync.enabled .Values.dags.persistence.enabled) }}
+ {{- if or .Values.dags.gitSync.enabled
.Values.dags.persistence.enabled }}
{{- include "airflow_dags_mount" . | nindent 12 }}
{{- end }}
Review Comment:
```suggestion
```
Dags mount is not needed in Airflow 2 for webserver if I recall correctly 🤔
##########
helm-tests/tests/helm_tests/airflow_core/test_worker.py:
##########
@@ -926,29 +926,7 @@ def
test_kerberos_init_container_default_different_versions(self, airflow_versio
is None
)
- @pytest.mark.parametrize("airflow_version", ["1.10.14", "2.0.2", "2.1.0",
"2.7.3"])
- @pytest.mark.parametrize(
- "workers_values",
- [
- {"kerberosInitContainer": {"enabled": True}},
- {"celery": {"kerberosInitContainer": {"enabled": True}}},
- ],
- )
- def test_kerberos_init_container_enable_unsupported(self, airflow_version,
workers_values):
- docs = render_chart(
- values={
- "airflowVersion": airflow_version,
- "workers": workers_values,
- },
- show_only=["templates/workers/worker-deployment.yaml"],
- )
-
- assert (
-
jmespath.search("spec.template.spec.initContainers[?name=='kerberos-init'] |
[0]", docs[0])
- is None
- )
-
- @pytest.mark.parametrize("airflow_version", ["2.8.0", "3.0.0"])
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
Review Comment:
I believe this is the `test_kerberos_init_container_enable_supported` test
case - we could adjust the name
##########
helm-tests/tests/helm_tests/airflow_core/test_worker.py:
##########
@@ -670,8 +670,8 @@ def test_runtime_class_name_values_are_configurable(self):
@pytest.mark.parametrize(
("airflow_version", "default_cmd"),
[
- ("2.7.0",
"airflow.providers.celery.executors.celery_executor.app"),
- ("2.6.3", "airflow.executors.celery_executor.app"),
+ ("2.11.0",
"airflow.providers.celery.executors.celery_executor.app"),
+ ("3.0.0",
"airflow.providers.celery.executors.celery_executor.app"),
Review Comment:
The test case can be simplified, as we are expecting the same result
##########
helm-tests/tests/helm_tests/webserver/test_webserver.py:
##########
@@ -625,15 +619,8 @@ def test_logs_persistence_adds_volume_and_mount(self,
log_persistence_values, ex
v["name"] for v in
jmespath.search("spec.template.spec.containers[0].volumeMounts", docs[0])
]
- @pytest.mark.parametrize(
- ("af_version", "pod_template_file_expected"),
- [
- ("1.10.10", False),
- ("1.10.12", True),
- ("2.1.0", True),
- ],
- )
- def test_config_volumes_and_mounts(self, af_version,
pod_template_file_expected):
+ def test_config_volumes_and_mounts(self):
+ af_version = "2.11.0"
# setup
docs = render_chart(
values={"airflowVersion": af_version},
Review Comment:
```suggestion
# setup
docs = render_chart(
values={"airflowVersion": "2.11.0"},
```
##########
helm-tests/tests/helm_tests/airflow_aux/test_pod_template_file.py:
##########
@@ -1159,27 +1159,7 @@ def
test_kerberos_init_container_default_different_versions(self, airflow_versio
assert jmespath.search("spec.initContainers[?name=='kerberos-init']",
docs[0]) is None
- @pytest.mark.parametrize("airflow_version", ["1.10.14", "2.0.2", "2.1.0",
"2.7.3"])
- @pytest.mark.parametrize(
- "workers_values",
- [
- {"kerberosInitContainer": {"enabled": True}},
- {"kubernetes": {"kerberosInitContainer": {"enabled": True}}},
- ],
- )
- def test_kerberos_init_container_enable_unsupported(self, airflow_version,
workers_values):
- docs = render_chart(
- values={
- "airflowVersion": airflow_version,
- "workers": workers_values,
- },
- show_only=["templates/pod-template-file.yaml"],
- chart_dir=self.temp_chart_dir,
- )
-
- assert jmespath.search("spec.initContainers[?name=='kerberos-init']",
docs[0]) is None
-
- @pytest.mark.parametrize("airflow_version", ["2.8.0", "3.0.0"])
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
Review Comment:
If I'm not mistaken, this is a change for
`test_kerberos_init_container_enable_supported` test case. We could change the
name to `test_kerberos_init_container_enable` as the init will always be
supported.
##########
helm-tests/tests/helm_tests/other/test_flower.py:
##########
@@ -91,9 +91,8 @@ def test_revision_history_limit_zero(
@pytest.mark.parametrize(
("airflow_version", "expected_arg"),
[
- ("2.0.2", "airflow celery flower"),
- ("1.10.14", "airflow flower"),
- ("2.1.0", "airflow celery flower"),
+ ("2.11.0", "airflow celery flower"),
+ ("3.0.0", "airflow celery flower"),
Review Comment:
The test case can be simplified as we are expecting the same result
##########
helm-tests/tests/helm_tests/webserver/test_webserver.py:
##########
@@ -372,15 +372,9 @@ def
test_should_add_extraEnvs_to_wait_for_migration_container(self):
"spec.template.spec.initContainers[0].env", docs[0]
)
- @pytest.mark.parametrize(
- ("airflow_version", "expected_arg"),
- [
- ("2.0.0", ["airflow", "db", "check-migrations",
"--migration-wait-timeout=60"]),
- ("2.1.0", ["airflow", "db", "check-migrations",
"--migration-wait-timeout=60"]),
- ("1.10.2", ["python", "-c"]),
- ],
- )
- def test_wait_for_migration_airflow_version(self, airflow_version,
expected_arg):
+ def test_wait_for_migration_airflow_version(self):
Review Comment:
```suggestion
def test_wait_for_migration(self):
```
##########
helm-tests/tests/helm_tests/airflow_core/test_triggerer.py:
##########
@@ -25,21 +25,14 @@
class TestTriggerer:
"""Tests triggerer."""
- @pytest.mark.parametrize(
- ("airflow_version", "num_docs"),
- [
- ("2.1.0", 0),
- ("2.2.0", 1),
- ],
- )
- def test_only_exists_on_new_airflow_versions(self, airflow_version,
num_docs):
+ @pytest.mark.parametrize("airflow_version", ["2.11.0", "3.0.0"])
+ def test_only_exists_on_new_airflow_versions(self, airflow_version):
Review Comment:
```suggestion
def test_triggerer_exists(self, airflow_version):
```
##########
chart/values.schema.json:
##########
@@ -91,7 +91,7 @@
"x-docsSection": "Common"
Review Comment:
There are values which will not be needed:
1. `enableBuiltInSecretEnvVars.AIRFLOW__CELERY__CELERY_RESULT_BACKEND`
2. `enableBuiltInSecretEnvVars.AIRFLOW__ELASTICSEARCH__ELASTICSEARCH_HOST`
and description of:
1. `scheduler.replicas`
2. `dagProcessor.enabled`
could be adjusted.
--
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]
