You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/08/08 05:55:25 UTC
[airflow] branch main updated: Upgrate Kubernetes and Helm Charts used during our tests (#25582)
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 0d34355ffa Upgrate Kubernetes and Helm Charts used during our tests (#25582)
0d34355ffa is described below
commit 0d34355ffa3f9f2ecf666d4518d36c4366a4c701
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Mon Aug 8 07:55:19 2022 +0200
Upgrate Kubernetes and Helm Charts used during our tests (#25582)
The Kubernetes and Helm Charts need to get new patch level bump.
Unfortunately the new Helm chart (correctly) refuses names of
releases containing capital letters so we also needed to update
our tests to use lower-case release names.
---
breeze-complete | 4 +-
scripts/ci/libraries/_initialization.sh | 4 +-
tests/charts/helm_template_generator.py | 2 +-
tests/charts/test_airflow_common.py | 2 +-
tests/charts/test_basic_helm_chart.py | 202 ++++++++++-----------
tests/charts/test_cleanup_pods.py | 6 +-
tests/charts/test_configmap.py | 4 +-
tests/charts/test_create_user_job.py | 2 +-
tests/charts/test_dag_processor.py | 4 +-
tests/charts/test_extra_configmaps_secrets.py | 2 +-
tests/charts/test_extra_env_env_from.py | 2 +-
tests/charts/test_flower.py | 12 +-
tests/charts/test_git_sync_webserver.py | 2 +-
tests/charts/test_keda.py | 2 +-
tests/charts/test_kerberos.py | 5 +-
tests/charts/test_metadata_connection_secret.py | 10 +-
tests/charts/test_migrate_database_job.py | 2 +-
tests/charts/test_pgbouncer.py | 20 +-
tests/charts/test_pod_launcher_role.py | 2 +-
tests/charts/test_pod_template_file.py | 6 +-
tests/charts/test_rbac.py | 130 ++++++-------
tests/charts/test_rbac_pod_log_reader.py | 12 +-
tests/charts/test_redis.py | 4 +-
.../test_result_backend_connection_secret.py | 14 +-
tests/charts/test_scc_rolebinding.py | 34 ++--
tests/charts/test_scheduler.py | 6 +-
tests/charts/test_statsd.py | 4 +-
tests/charts/test_triggerer.py | 4 +-
tests/charts/test_webserver.py | 28 +--
tests/charts/test_worker.py | 6 +-
30 files changed, 269 insertions(+), 268 deletions(-)
diff --git a/breeze-complete b/breeze-complete
index 2fd1a9d1a8..7939536cba 100644
--- a/breeze-complete
+++ b/breeze-complete
@@ -26,8 +26,8 @@ _breeze_allowed_python_major_minor_versions="3.7 3.8 3.9 3.10"
_breeze_allowed_backends="sqlite mysql postgres mssql"
_breeze_allowed_integrations="cassandra kerberos mongo openldap pinot rabbitmq redis statsd trino all"
_breeze_allowed_kubernetes_modes="image"
-_breeze_allowed_kubernetes_versions="v1.24.0 v1.23.6 v1.22.9 v1.21.12 v1.20.15"
-_breeze_allowed_helm_versions="v3.6.3"
+_breeze_allowed_kubernetes_versions="v1.24.2 v1.23.6 v1.22.9 v1.21.12 v1.20.15"
+_breeze_allowed_helm_versions="v3.9.2"
_breeze_allowed_kind_versions="v0.14.0"
_breeze_allowed_mysql_versions="5.7 8"
_breeze_allowed_mssql_versions="2017-latest 2019-latest"
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index d0d6a788fd..c8e69ab64e 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -463,7 +463,7 @@ function initialization::initialize_image_build_variables() {
# Determine versions of kubernetes cluster and tools used
function initialization::initialize_kubernetes_variables() {
# Currently supported versions of Kubernetes
- CURRENT_KUBERNETES_VERSIONS+=("v1.24.0" "v1.23.6" "v1.22.9" "v1.21.12" "v1.20.15")
+ CURRENT_KUBERNETES_VERSIONS+=("v1.24.2" "v1.23.6" "v1.22.9" "v1.21.12" "v1.20.15")
export CURRENT_KUBERNETES_VERSIONS
# Currently supported modes of Kubernetes
CURRENT_KUBERNETES_MODES+=("image")
@@ -472,7 +472,7 @@ function initialization::initialize_kubernetes_variables() {
CURRENT_KIND_VERSIONS+=("v0.14.0")
export CURRENT_KIND_VERSIONS
# Currently supported versions of Helm
- CURRENT_HELM_VERSIONS+=("v3.6.3")
+ CURRENT_HELM_VERSIONS+=("v3.9.2")
export CURRENT_HELM_VERSIONS
# Current executor in chart
CURRENT_EXECUTOR+=("KubernetesExecutor")
diff --git a/tests/charts/helm_template_generator.py b/tests/charts/helm_template_generator.py
index 17784a34e0..a779e11230 100644
--- a/tests/charts/helm_template_generator.py
+++ b/tests/charts/helm_template_generator.py
@@ -102,7 +102,7 @@ def validate_k8s_object(instance, kubernetes_version):
def render_chart(
- name="RELEASE-NAME",
+ name="release-name",
values=None,
show_only=None,
chart_dir=None,
diff --git a/tests/charts/test_airflow_common.py b/tests/charts/test_airflow_common.py
index 4358f18048..c5f7258a47 100644
--- a/tests/charts/test_airflow_common.py
+++ b/tests/charts/test_airflow_common.py
@@ -93,7 +93,7 @@ class TestAirflowCommon:
Test Annotations are correctly applied on all pods created Scheduler, Webserver & Worker
deployments.
"""
- release_name = "TEST-BASIC"
+ release_name = "test-basic"
k8s_objects = render_chart(
name=release_name,
values={
diff --git a/tests/charts/test_basic_helm_chart.py b/tests/charts/test_basic_helm_chart.py
index 2e02d9cf73..da53af0d06 100644
--- a/tests/charts/test_basic_helm_chart.py
+++ b/tests/charts/test_basic_helm_chart.py
@@ -44,14 +44,14 @@ class TestBaseChartTest(unittest.TestCase):
def test_basic_deployments(self, version):
expected_object_count_in_basic_deployment = self._get_object_count(version)
k8s_objects = render_chart(
- "TEST-BASIC",
+ "test-basic",
self._get_values_with_version(
values={
"chart": {
'metadata': 'AA',
},
- 'labels': {"TEST-LABEL": "TEST-VALUE"},
- "fullnameOverride": "TEST-BASIC",
+ 'labels': {"test-label": "TEST-VALUE"},
+ "fullnameOverride": "test-basic",
},
version=version,
),
@@ -61,43 +61,43 @@ class TestBaseChartTest(unittest.TestCase):
}
# TODO remove default from condition after airflow update
if version == "2.3.2" or version == "default":
- assert ('Secret', 'TEST-BASIC-airflow-result-backend') in list_of_kind_names_tuples
- list_of_kind_names_tuples.remove(('Secret', 'TEST-BASIC-airflow-result-backend'))
+ assert ('Secret', 'test-basic-airflow-result-backend') in list_of_kind_names_tuples
+ list_of_kind_names_tuples.remove(('Secret', 'test-basic-airflow-result-backend'))
assert list_of_kind_names_tuples == {
- ('ServiceAccount', 'TEST-BASIC-create-user-job'),
- ('ServiceAccount', 'TEST-BASIC-migrate-database-job'),
- ('ServiceAccount', 'TEST-BASIC-redis'),
- ('ServiceAccount', 'TEST-BASIC-scheduler'),
- ('ServiceAccount', 'TEST-BASIC-statsd'),
- ('ServiceAccount', 'TEST-BASIC-triggerer'),
- ('ServiceAccount', 'TEST-BASIC-webserver'),
- ('ServiceAccount', 'TEST-BASIC-worker'),
- ('Secret', 'TEST-BASIC-airflow-metadata'),
- ('Secret', 'TEST-BASIC-broker-url'),
- ('Secret', 'TEST-BASIC-fernet-key'),
- ('Secret', 'TEST-BASIC-webserver-secret-key'),
- ('Secret', 'TEST-BASIC-postgresql'),
- ('Secret', 'TEST-BASIC-redis-password'),
- ('ConfigMap', 'TEST-BASIC-airflow-config'),
- ('Role', 'TEST-BASIC-pod-launcher-role'),
- ('Role', 'TEST-BASIC-pod-log-reader-role'),
- ('RoleBinding', 'TEST-BASIC-pod-launcher-rolebinding'),
- ('RoleBinding', 'TEST-BASIC-pod-log-reader-rolebinding'),
- ('Service', 'TEST-BASIC-postgresql-headless'),
- ('Service', 'TEST-BASIC-postgresql'),
- ('Service', 'TEST-BASIC-redis'),
- ('Service', 'TEST-BASIC-statsd'),
- ('Service', 'TEST-BASIC-webserver'),
- ('Service', 'TEST-BASIC-worker'),
- ('Deployment', 'TEST-BASIC-scheduler'),
- ('Deployment', 'TEST-BASIC-statsd'),
- ('Deployment', 'TEST-BASIC-triggerer'),
- ('Deployment', 'TEST-BASIC-webserver'),
- ('StatefulSet', 'TEST-BASIC-postgresql'),
- ('StatefulSet', 'TEST-BASIC-redis'),
- ('StatefulSet', 'TEST-BASIC-worker'),
- ('Job', 'TEST-BASIC-create-user'),
- ('Job', 'TEST-BASIC-run-airflow-migrations'),
+ ('ServiceAccount', 'test-basic-create-user-job'),
+ ('ServiceAccount', 'test-basic-migrate-database-job'),
+ ('ServiceAccount', 'test-basic-redis'),
+ ('ServiceAccount', 'test-basic-scheduler'),
+ ('ServiceAccount', 'test-basic-statsd'),
+ ('ServiceAccount', 'test-basic-triggerer'),
+ ('ServiceAccount', 'test-basic-webserver'),
+ ('ServiceAccount', 'test-basic-worker'),
+ ('Secret', 'test-basic-airflow-metadata'),
+ ('Secret', 'test-basic-broker-url'),
+ ('Secret', 'test-basic-fernet-key'),
+ ('Secret', 'test-basic-webserver-secret-key'),
+ ('Secret', 'test-basic-postgresql'),
+ ('Secret', 'test-basic-redis-password'),
+ ('ConfigMap', 'test-basic-airflow-config'),
+ ('Role', 'test-basic-pod-launcher-role'),
+ ('Role', 'test-basic-pod-log-reader-role'),
+ ('RoleBinding', 'test-basic-pod-launcher-rolebinding'),
+ ('RoleBinding', 'test-basic-pod-log-reader-rolebinding'),
+ ('Service', 'test-basic-postgresql-headless'),
+ ('Service', 'test-basic-postgresql'),
+ ('Service', 'test-basic-redis'),
+ ('Service', 'test-basic-statsd'),
+ ('Service', 'test-basic-webserver'),
+ ('Service', 'test-basic-worker'),
+ ('Deployment', 'test-basic-scheduler'),
+ ('Deployment', 'test-basic-statsd'),
+ ('Deployment', 'test-basic-triggerer'),
+ ('Deployment', 'test-basic-webserver'),
+ ('StatefulSet', 'test-basic-postgresql'),
+ ('StatefulSet', 'test-basic-redis'),
+ ('StatefulSet', 'test-basic-worker'),
+ ('Job', 'test-basic-create-user'),
+ ('Job', 'test-basic-run-airflow-migrations'),
}
assert expected_object_count_in_basic_deployment == len(k8s_objects)
for k8s_object in k8s_objects:
@@ -110,8 +110,8 @@ class TestBaseChartTest(unittest.TestCase):
continue
k8s_name = k8s_object['kind'] + ":" + k8s_object['metadata']['name']
assert 'TEST-VALUE' == labels.get(
- "TEST-LABEL"
- ), f"Missing label TEST-LABEL on {k8s_name}. Current labels: {labels}"
+ "test-label"
+ ), f"Missing label test-label on {k8s_name}. Current labels: {labels}"
@parameterized.expand(["2.3.2", "2.4.0", "default"])
def test_basic_deployment_with_standalone_dag_processor(self, version):
@@ -119,14 +119,14 @@ class TestBaseChartTest(unittest.TestCase):
object_count_in_basic_deployment = self._get_object_count(version)
expected_object_count_with_standalone_scheduler = object_count_in_basic_deployment + 2
k8s_objects = render_chart(
- "TEST-BASIC",
+ "test-basic",
self._get_values_with_version(
values={
"chart": {
'metadata': 'AA',
},
- 'labels': {"TEST-LABEL": "TEST-VALUE"},
- "fullnameOverride": "TEST-BASIC",
+ 'labels': {"test-label": "TEST-VALUE"},
+ "fullnameOverride": "test-basic",
"dagProcessor": {'enabled': True},
},
version=version,
@@ -137,45 +137,45 @@ class TestBaseChartTest(unittest.TestCase):
}
# TODO remove default from condition after airflow update
if version == "2.3.2" or version == "default":
- assert ('Secret', 'TEST-BASIC-airflow-result-backend') in list_of_kind_names_tuples
- list_of_kind_names_tuples.remove(('Secret', 'TEST-BASIC-airflow-result-backend'))
+ assert ('Secret', 'test-basic-airflow-result-backend') in list_of_kind_names_tuples
+ list_of_kind_names_tuples.remove(('Secret', 'test-basic-airflow-result-backend'))
assert list_of_kind_names_tuples == {
- ('ServiceAccount', 'TEST-BASIC-create-user-job'),
- ('ServiceAccount', 'TEST-BASIC-migrate-database-job'),
- ('ServiceAccount', 'TEST-BASIC-redis'),
- ('ServiceAccount', 'TEST-BASIC-scheduler'),
- ('ServiceAccount', 'TEST-BASIC-statsd'),
- ('ServiceAccount', 'TEST-BASIC-triggerer'),
- ('ServiceAccount', 'TEST-BASIC-dag-processor'),
- ('ServiceAccount', 'TEST-BASIC-webserver'),
- ('ServiceAccount', 'TEST-BASIC-worker'),
- ('Secret', 'TEST-BASIC-airflow-metadata'),
- ('Secret', 'TEST-BASIC-broker-url'),
- ('Secret', 'TEST-BASIC-fernet-key'),
- ('Secret', 'TEST-BASIC-webserver-secret-key'),
- ('Secret', 'TEST-BASIC-postgresql'),
- ('Secret', 'TEST-BASIC-redis-password'),
- ('ConfigMap', 'TEST-BASIC-airflow-config'),
- ('Role', 'TEST-BASIC-pod-launcher-role'),
- ('Role', 'TEST-BASIC-pod-log-reader-role'),
- ('RoleBinding', 'TEST-BASIC-pod-launcher-rolebinding'),
- ('RoleBinding', 'TEST-BASIC-pod-log-reader-rolebinding'),
- ('Service', 'TEST-BASIC-postgresql-headless'),
- ('Service', 'TEST-BASIC-postgresql'),
- ('Service', 'TEST-BASIC-redis'),
- ('Service', 'TEST-BASIC-statsd'),
- ('Service', 'TEST-BASIC-webserver'),
- ('Service', 'TEST-BASIC-worker'),
- ('Deployment', 'TEST-BASIC-scheduler'),
- ('Deployment', 'TEST-BASIC-statsd'),
- ('Deployment', 'TEST-BASIC-triggerer'),
- ('Deployment', 'TEST-BASIC-dag-processor'),
- ('Deployment', 'TEST-BASIC-webserver'),
- ('StatefulSet', 'TEST-BASIC-postgresql'),
- ('StatefulSet', 'TEST-BASIC-redis'),
- ('StatefulSet', 'TEST-BASIC-worker'),
- ('Job', 'TEST-BASIC-create-user'),
- ('Job', 'TEST-BASIC-run-airflow-migrations'),
+ ('ServiceAccount', 'test-basic-create-user-job'),
+ ('ServiceAccount', 'test-basic-migrate-database-job'),
+ ('ServiceAccount', 'test-basic-redis'),
+ ('ServiceAccount', 'test-basic-scheduler'),
+ ('ServiceAccount', 'test-basic-statsd'),
+ ('ServiceAccount', 'test-basic-triggerer'),
+ ('ServiceAccount', 'test-basic-dag-processor'),
+ ('ServiceAccount', 'test-basic-webserver'),
+ ('ServiceAccount', 'test-basic-worker'),
+ ('Secret', 'test-basic-airflow-metadata'),
+ ('Secret', 'test-basic-broker-url'),
+ ('Secret', 'test-basic-fernet-key'),
+ ('Secret', 'test-basic-webserver-secret-key'),
+ ('Secret', 'test-basic-postgresql'),
+ ('Secret', 'test-basic-redis-password'),
+ ('ConfigMap', 'test-basic-airflow-config'),
+ ('Role', 'test-basic-pod-launcher-role'),
+ ('Role', 'test-basic-pod-log-reader-role'),
+ ('RoleBinding', 'test-basic-pod-launcher-rolebinding'),
+ ('RoleBinding', 'test-basic-pod-log-reader-rolebinding'),
+ ('Service', 'test-basic-postgresql-headless'),
+ ('Service', 'test-basic-postgresql'),
+ ('Service', 'test-basic-redis'),
+ ('Service', 'test-basic-statsd'),
+ ('Service', 'test-basic-webserver'),
+ ('Service', 'test-basic-worker'),
+ ('Deployment', 'test-basic-scheduler'),
+ ('Deployment', 'test-basic-statsd'),
+ ('Deployment', 'test-basic-triggerer'),
+ ('Deployment', 'test-basic-dag-processor'),
+ ('Deployment', 'test-basic-webserver'),
+ ('StatefulSet', 'test-basic-postgresql'),
+ ('StatefulSet', 'test-basic-redis'),
+ ('StatefulSet', 'test-basic-worker'),
+ ('Job', 'test-basic-create-user'),
+ ('Job', 'test-basic-run-airflow-migrations'),
}
assert expected_object_count_with_standalone_scheduler == len(k8s_objects)
for k8s_object in k8s_objects:
@@ -188,14 +188,14 @@ class TestBaseChartTest(unittest.TestCase):
continue
k8s_name = k8s_object['kind'] + ":" + k8s_object['metadata']['name']
assert 'TEST-VALUE' == labels.get(
- "TEST-LABEL"
- ), f"Missing label TEST-LABEL on {k8s_name}. Current labels: {labels}"
+ "test-label"
+ ), f"Missing label test-label on {k8s_name}. Current labels: {labels}"
@parameterized.expand(["2.3.2", "2.4.0", "default"])
def test_basic_deployment_without_default_users(self, version):
expected_object_count_in_basic_deployment = self._get_object_count(version)
k8s_objects = render_chart(
- "TEST-BASIC",
+ "test-basic",
values=self._get_values_with_version(
values={"webserver": {"defaultUser": {'enabled': False}}}, version=version
),
@@ -203,12 +203,12 @@ class TestBaseChartTest(unittest.TestCase):
list_of_kind_names_tuples = [
(k8s_object['kind'], k8s_object['metadata']['name']) for k8s_object in k8s_objects
]
- assert ('Job', 'TEST-BASIC-create-user') not in list_of_kind_names_tuples
+ assert ('Job', 'test-basic-create-user') not in list_of_kind_names_tuples
assert expected_object_count_in_basic_deployment - 2 == len(k8s_objects)
def test_network_policies_are_valid(self):
k8s_objects = render_chart(
- "TEST-BASIC",
+ "test-basic",
{
"networkPolicies": {"enabled": True},
"executor": "CeleryExecutor",
@@ -221,20 +221,20 @@ class TestBaseChartTest(unittest.TestCase):
}
expected_kind_names = [
- ('NetworkPolicy', 'TEST-BASIC-redis-policy'),
- ('NetworkPolicy', 'TEST-BASIC-flower-policy'),
- ('NetworkPolicy', 'TEST-BASIC-pgbouncer-policy'),
- ('NetworkPolicy', 'TEST-BASIC-scheduler-policy'),
- ('NetworkPolicy', 'TEST-BASIC-statsd-policy'),
- ('NetworkPolicy', 'TEST-BASIC-webserver-policy'),
- ('NetworkPolicy', 'TEST-BASIC-worker-policy'),
+ ('NetworkPolicy', 'test-basic-redis-policy'),
+ ('NetworkPolicy', 'test-basic-flower-policy'),
+ ('NetworkPolicy', 'test-basic-pgbouncer-policy'),
+ ('NetworkPolicy', 'test-basic-scheduler-policy'),
+ ('NetworkPolicy', 'test-basic-statsd-policy'),
+ ('NetworkPolicy', 'test-basic-webserver-policy'),
+ ('NetworkPolicy', 'test-basic-worker-policy'),
]
for kind_name in expected_kind_names:
assert kind_name in kind_names_tuples
def test_labels_are_valid(self):
"""Test labels are correctly applied on all objects created by this chart"""
- release_name = "TEST-BASIC"
+ release_name = "test-basic"
k8s_objects = render_chart(
name=release_name,
values={
@@ -344,7 +344,7 @@ class TestBaseChartTest(unittest.TestCase):
def test_labels_are_valid_on_job_templates(self):
"""Test labels are correctly applied on all job templates created by this chart"""
- release_name = "TEST-BASIC"
+ release_name = "test-basic"
k8s_objects = render_chart(
name=release_name,
values={
@@ -384,7 +384,7 @@ class TestBaseChartTest(unittest.TestCase):
Test Annotations are correctly applied on all pods created Scheduler, Webserver & Worker
deployments.
"""
- release_name = "TEST-BASIC"
+ release_name = "test-basic"
k8s_objects = render_chart(
name=release_name,
values={
@@ -431,7 +431,7 @@ class TestBaseChartTest(unittest.TestCase):
return out
image_repo = "test-airflow-repo/airflow"
- k8s_objects = render_chart("TEST-BASIC", {"defaultAirflowRepository": image_repo})
+ k8s_objects = render_chart("test-basic", {"defaultAirflowRepository": image_repo})
objs_with_image = get_k8s_objs_with_image(k8s_objects)
for obj in objs_with_image:
@@ -443,7 +443,7 @@ class TestBaseChartTest(unittest.TestCase):
def test_unsupported_executor(self):
with self.assertRaises(CalledProcessError) as ex_ctx:
render_chart(
- "TEST-BASIC",
+ "test-basic",
{
"executor": "SequentialExecutor",
},
@@ -469,7 +469,7 @@ class TestBaseChartTest(unittest.TestCase):
def test_invalid_pull_policy(self, image):
with self.assertRaises(CalledProcessError) as ex_ctx:
render_chart(
- "TEST-BASIC",
+ "test-basic",
{
"images": {image: {"pullPolicy": "InvalidPolicy"}},
},
@@ -482,7 +482,7 @@ class TestBaseChartTest(unittest.TestCase):
def test_invalid_dags_access_mode(self):
with self.assertRaises(CalledProcessError) as ex_ctx:
render_chart(
- "TEST-BASIC",
+ "test-basic",
{
"dags": {"persistence": {"accessMode": "InvalidMode"}},
},
diff --git a/tests/charts/test_cleanup_pods.py b/tests/charts/test_cleanup_pods.py
index ebeff34f6c..3906a2c2f5 100644
--- a/tests/charts/test_cleanup_pods.py
+++ b/tests/charts/test_cleanup_pods.py
@@ -38,7 +38,7 @@ class CleanupPodsTest(unittest.TestCase):
assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].image", docs[0]).startswith(
'apache/airflow'
)
- assert {"name": "config", "configMap": {"name": "RELEASE-NAME-airflow-config"}} in jmespath.search(
+ assert {"name": "config", "configMap": {"name": "release-name-airflow-config"}} in jmespath.search(
"spec.jobTemplate.spec.template.spec.volumes", docs[0]
)
assert {
@@ -154,7 +154,7 @@ class CleanupPodsTest(unittest.TestCase):
show_only=["templates/cleanup/cleanup-cronjob.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search(
+ assert ["release-name"] == jmespath.search(
"spec.jobTemplate.spec.template.spec.containers[0].command", docs[0]
)
assert ["Helm"] == jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].args", docs[0])
@@ -171,7 +171,7 @@ class CleanupPodsTest(unittest.TestCase):
assert {
"tier": "airflow",
"component": "airflow-cleanup-pods",
- "release": "RELEASE-NAME",
+ "release": "release-name",
"project": "airflow",
} == jmespath.search("spec.jobTemplate.spec.template.metadata.labels", docs[0])
diff --git a/tests/charts/test_configmap.py b/tests/charts/test_configmap.py
index 41e263efcc..40029fe94a 100644
--- a/tests/charts/test_configmap.py
+++ b/tests/charts/test_configmap.py
@@ -80,7 +80,7 @@ class ConfigmapTest(unittest.TestCase):
)
assert (
- "# Well hello RELEASE-NAME!"
+ "# Well hello release-name!"
== jmespath.search('data."airflow_local_settings.py"', docs[0]).strip()
)
@@ -112,4 +112,4 @@ metadata:
)
pod_template_file = jmespath.search('data."pod_template_file.yaml"', docs[0])
- assert "mylabel: RELEASE-NAME" in pod_template_file
+ assert "mylabel: release-name" in pod_template_file
diff --git a/tests/charts/test_create_user_job.py b/tests/charts/test_create_user_job.py
index 529464fada..094fd3b5b9 100644
--- a/tests/charts/test_create_user_job.py
+++ b/tests/charts/test_create_user_job.py
@@ -229,7 +229,7 @@ class CreateUserJobTest(unittest.TestCase):
show_only=["templates/jobs/create-user-job.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_default_user_overrides(self):
diff --git a/tests/charts/test_dag_processor.py b/tests/charts/test_dag_processor.py
index 11367aa6e0..6e322df12e 100644
--- a/tests/charts/test_dag_processor.py
+++ b/tests/charts/test_dag_processor.py
@@ -283,7 +283,7 @@ class DagProcessorTest(unittest.TestCase):
@parameterized.expand(
[
({"enabled": False}, {"emptyDir": {}}),
- ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "RELEASE-NAME-logs"}}),
+ ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "release-name-logs"}}),
(
{"enabled": True, "existingClaim": "test-claim"},
{"persistentVolumeClaim": {"claimName": "test-claim"}},
@@ -425,7 +425,7 @@ class DagProcessorTest(unittest.TestCase):
show_only=["templates/dag-processor/dag-processor-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_dags_volume_mount_with_persistence_true(self):
diff --git a/tests/charts/test_extra_configmaps_secrets.py b/tests/charts/test_extra_configmaps_secrets.py
index 7bf0b9fab5..7c85328c1c 100644
--- a/tests/charts/test_extra_configmaps_secrets.py
+++ b/tests/charts/test_extra_configmaps_secrets.py
@@ -25,7 +25,7 @@ from parameterized import parameterized
from tests.charts.helm_template_generator import prepare_k8s_lookup_dict, render_chart
-RELEASE_NAME = "TEST-EXTRA-CONFIGMAPS-SECRETS"
+RELEASE_NAME = "test-extra-configmaps-secrets"
class ExtraConfigMapsSecretsTest(unittest.TestCase):
diff --git a/tests/charts/test_extra_env_env_from.py b/tests/charts/test_extra_env_env_from.py
index 83c6a95602..9458e87d99 100644
--- a/tests/charts/test_extra_env_env_from.py
+++ b/tests/charts/test_extra_env_env_from.py
@@ -25,7 +25,7 @@ from parameterized import parameterized
from tests.charts.helm_template_generator import prepare_k8s_lookup_dict, render_chart
-RELEASE_NAME = "TEST-EXTRA-ENV-ENV-FROM"
+RELEASE_NAME = "test-extra-env-env-from"
# Test Params: k8s object key and paths with expected env / envFrom
PARAMS = [
diff --git a/tests/charts/test_flower.py b/tests/charts/test_flower.py
index 52f99f1121..68b16aed93 100644
--- a/tests/charts/test_flower.py
+++ b/tests/charts/test_flower.py
@@ -42,7 +42,7 @@ class TestFlowerDeployment:
assert bool(docs) is created
if created:
- assert "RELEASE-NAME-flower" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-flower" == jmespath.search("metadata.name", docs[0])
assert "flower" == jmespath.search("spec.template.spec.containers[0].name", docs[0])
@parameterized.expand([(8, 10), (10, 8), (8, None), (None, 10), (None, None)])
@@ -118,7 +118,7 @@ class TestFlowerDeployment:
show_only=["templates/flower/flower-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_should_create_flower_deployment_with_authorization(self):
@@ -286,7 +286,7 @@ class TestFlowerService:
assert bool(docs) is created
if created:
- assert "RELEASE-NAME-flower" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-flower" == jmespath.search("metadata.name", docs[0])
def test_default_service(self):
docs = render_chart(
@@ -294,9 +294,9 @@ class TestFlowerService:
show_only=["templates/flower/flower-service.yaml"],
)
- assert "RELEASE-NAME-flower" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-flower" == jmespath.search("metadata.name", docs[0])
assert jmespath.search("metadata.annotations", docs[0]) is None
- assert {"tier": "airflow", "component": "flower", "release": "RELEASE-NAME"} == jmespath.search(
+ assert {"tier": "airflow", "component": "flower", "release": "release-name"} == jmespath.search(
"spec.selector", docs[0]
)
assert "ClusterIP" == jmespath.search("spec.type", docs[0])
@@ -331,7 +331,7 @@ class TestFlowerService:
([{"port": 8888}], [{"port": 8888}]), # name is optional with a single port
(
[{"name": "{{ .Release.Name }}", "protocol": "UDP", "port": "{{ .Values.ports.flowerUI }}"}],
- [{"name": "RELEASE-NAME", "protocol": "UDP", "port": 5555}],
+ [{"name": "release-name", "protocol": "UDP", "port": 5555}],
),
([{"name": "only_sidecar", "port": "{{ int 9000 }}"}], [{"name": "only_sidecar", "port": 9000}]),
(
diff --git a/tests/charts/test_git_sync_webserver.py b/tests/charts/test_git_sync_webserver.py
index 3d70400b98..1b306fdb13 100644
--- a/tests/charts/test_git_sync_webserver.py
+++ b/tests/charts/test_git_sync_webserver.py
@@ -66,7 +66,7 @@ class GitSyncWebserverTest(unittest.TestCase):
show_only=["templates/webserver/webserver-deployment.yaml"],
)
- assert "RELEASE-NAME-airflow-webserver" == jmespath.search(
+ assert "release-name-airflow-webserver" == jmespath.search(
"spec.template.spec.serviceAccountName", docs[0]
)
diff --git a/tests/charts/test_keda.py b/tests/charts/test_keda.py
index e897378a97..3d442ae81b 100644
--- a/tests/charts/test_keda.py
+++ b/tests/charts/test_keda.py
@@ -48,7 +48,7 @@ class TestKeda:
show_only=["templates/workers/worker-kedaautoscaler.yaml"],
)
if is_created:
- assert jmespath.search("metadata.name", docs[0]) == "RELEASE-NAME-worker"
+ assert jmespath.search("metadata.name", docs[0]) == "release-name-worker"
else:
assert docs == []
diff --git a/tests/charts/test_kerberos.py b/tests/charts/test_kerberos.py
index 26657c3bf7..bb6249e357 100644
--- a/tests/charts/test_kerberos.py
+++ b/tests/charts/test_kerberos.py
@@ -25,10 +25,11 @@ from tests.charts.helm_template_generator import render_chart
class KerberosTest(unittest.TestCase):
def test_kerberos_not_mentioned_in_render_if_disabled(self):
- k8s_objects = render_chart(name="NO-KERBEROS", values={"kerberos": {'enabled': False}})
+ # the name is deliberately shorter as we look for "kerberos" in the rendered chart
+ k8s_objects = render_chart(name="no-krbros", values={"kerberos": {'enabled': False}})
# ignore airflow config map
k8s_objects_to_consider = [
- obj for obj in k8s_objects if obj["metadata"]["name"] != "NO-KERBEROS-airflow-config"
+ obj for obj in k8s_objects if obj["metadata"]["name"] != "no-krbros-airflow-config"
]
k8s_objects_to_consider_str = json.dumps(k8s_objects_to_consider)
assert k8s_objects_to_consider_str.count("kerberos") == 1
diff --git a/tests/charts/test_metadata_connection_secret.py b/tests/charts/test_metadata_connection_secret.py
index a76625f25c..05bf75f9a3 100644
--- a/tests/charts/test_metadata_connection_secret.py
+++ b/tests/charts/test_metadata_connection_secret.py
@@ -53,7 +53,7 @@ class MetadataConnectionSecretTest(unittest.TestCase):
connection = self._get_connection({})
assert (
- "postgresql://postgres:postgres@RELEASE-NAME-postgresql.default:5432/postgres?sslmode=disable"
+ "postgresql://postgres:postgres@release-name-postgresql.default:5432/postgres?sslmode=disable"
== connection
)
@@ -63,8 +63,8 @@ class MetadataConnectionSecretTest(unittest.TestCase):
# host, port, dbname get overridden
assert (
- "postgresql://postgres:postgres@RELEASE-NAME-pgbouncer.default:6543"
- "/RELEASE-NAME-metadata?sslmode=disable" == connection
+ "postgresql://postgres:postgres@release-name-pgbouncer.default:6543"
+ "/release-name-metadata?sslmode=disable" == connection
)
def test_should_set_pgbouncer_overrides_with_non_chart_database_when_enabled(self):
@@ -76,8 +76,8 @@ class MetadataConnectionSecretTest(unittest.TestCase):
# host, port, dbname still get overridden even with an non-chart db
assert (
- "postgresql://someuser:somepass@RELEASE-NAME-pgbouncer.default:6543"
- "/RELEASE-NAME-metadata?sslmode=disable" == connection
+ "postgresql://someuser:somepass@release-name-pgbouncer.default:6543"
+ "/release-name-metadata?sslmode=disable" == connection
)
def test_should_correctly_use_non_chart_database(self):
diff --git a/tests/charts/test_migrate_database_job.py b/tests/charts/test_migrate_database_job.py
index 72c4b42c92..28dfadbd17 100644
--- a/tests/charts/test_migrate_database_job.py
+++ b/tests/charts/test_migrate_database_job.py
@@ -265,5 +265,5 @@ class TestMigrateDatabaseJob:
show_only=["templates/jobs/migrate-database-job.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
diff --git a/tests/charts/test_pgbouncer.py b/tests/charts/test_pgbouncer.py
index 8783b509b0..2a6e0f9f45 100644
--- a/tests/charts/test_pgbouncer.py
+++ b/tests/charts/test_pgbouncer.py
@@ -39,7 +39,7 @@ class PgbouncerTest(unittest.TestCase):
)
assert "Deployment" == jmespath.search("kind", docs[0])
- assert "RELEASE-NAME-pgbouncer" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-pgbouncer" == jmespath.search("metadata.name", docs[0])
assert "pgbouncer" == jmespath.search("spec.template.spec.containers[0].name", docs[0])
def test_should_create_pgbouncer_service(self):
@@ -49,7 +49,7 @@ class PgbouncerTest(unittest.TestCase):
)
assert "Service" == jmespath.search("kind", docs[0])
- assert "RELEASE-NAME-pgbouncer" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-pgbouncer" == jmespath.search("metadata.name", docs[0])
assert "true" == jmespath.search('metadata.annotations."prometheus.io/scrape"', docs[0])
assert "9127" == jmespath.search('metadata.annotations."prometheus.io/port"', docs[0])
@@ -160,7 +160,7 @@ class PgbouncerTest(unittest.TestCase):
def test_no_existing_secret(self):
docs = render_chart(
- "TEST-PGBOUNCER-CONFIG",
+ "test-pgbouncer-config",
values={
"pgbouncer": {"enabled": True},
},
@@ -169,12 +169,12 @@ class PgbouncerTest(unittest.TestCase):
assert {
"name": "pgbouncer-config",
- "secret": {"secretName": "TEST-PGBOUNCER-CONFIG-pgbouncer-config"},
+ "secret": {"secretName": "test-pgbouncer-config-pgbouncer-config"},
} == jmespath.search("spec.template.spec.volumes[0]", docs[0])
def test_existing_secret(self):
docs = render_chart(
- "TEST-PGBOUNCER-CONFIG",
+ "test-pgbouncer-config",
values={
"pgbouncer": {"enabled": True, "configSecretName": "pgbouncer-config-secret"},
},
@@ -281,7 +281,7 @@ class PgbouncerTest(unittest.TestCase):
show_only=["templates/pgbouncer/pgbouncer-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_should_add_extra_volume_and_extra_volume_mount(self):
@@ -331,11 +331,11 @@ class PgbouncerConfigTest(unittest.TestCase):
ini = self._get_pgbouncer_ini({"pgbouncer": {"enabled": True}})
assert (
- "RELEASE-NAME-metadata = host=RELEASE-NAME-postgresql.default dbname=postgres port=5432"
+ "release-name-metadata = host=release-name-postgresql.default dbname=postgres port=5432"
" pool_size=10" in ini
)
assert (
- "RELEASE-NAME-result-backend = host=RELEASE-NAME-postgresql.default dbname=postgres port=5432"
+ "release-name-result-backend = host=release-name-postgresql.default dbname=postgres port=5432"
" pool_size=5" in ini
)
@@ -364,11 +364,11 @@ class PgbouncerConfigTest(unittest.TestCase):
ini = self._get_pgbouncer_ini(values)
assert (
- "RELEASE-NAME-metadata = host=meta_host dbname=meta_db port=1111 pool_size=12 reserve_pool = 5"
+ "release-name-metadata = host=meta_host dbname=meta_db port=1111 pool_size=12 reserve_pool = 5"
in ini
)
assert (
- "RELEASE-NAME-result-backend = host=rb_host dbname=rb_db port=2222 pool_size=7 reserve_pool = 3"
+ "release-name-result-backend = host=rb_host dbname=rb_db port=2222 pool_size=7 reserve_pool = 3"
in ini
)
diff --git a/tests/charts/test_pod_launcher_role.py b/tests/charts/test_pod_launcher_role.py
index 42b1756e1e..c3894634ec 100644
--- a/tests/charts/test_pod_launcher_role.py
+++ b/tests/charts/test_pod_launcher_role.py
@@ -44,6 +44,6 @@ class PodLauncherTest(unittest.TestCase):
)
if expected_accounts:
for idx, suffix in enumerate(expected_accounts):
- assert f"RELEASE-NAME-airflow-{suffix}" == jmespath.search(f"subjects[{idx}].name", docs[0])
+ assert f"release-name-airflow-{suffix}" == jmespath.search(f"subjects[{idx}].name", docs[0])
else:
assert [] == docs
diff --git a/tests/charts/test_pod_template_file.py b/tests/charts/test_pod_template_file.py
index 12d1d590c5..612eae5591 100644
--- a/tests/charts/test_pod_template_file.py
+++ b/tests/charts/test_pod_template_file.py
@@ -260,7 +260,7 @@ class PodTemplateFileTest(unittest.TestCase):
@parameterized.expand(
[
({"enabled": False}, {"emptyDir": {}}),
- ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "RELEASE-NAME-logs"}}),
+ ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "release-name-logs"}}),
(
{"enabled": True, "existingClaim": "test-claim"},
{"persistentVolumeClaim": {"claimName": "test-claim"}},
@@ -295,7 +295,7 @@ class PodTemplateFileTest(unittest.TestCase):
)
assert re.search("Pod", docs[0]["kind"])
- assert {'configMap': {'name': 'RELEASE-NAME-airflow-config'}, 'name': 'config'} in jmespath.search(
+ assert {'configMap': {'name': 'release-name-airflow-config'}, 'name': 'config'} in jmespath.search(
"spec.volumes", docs[0]
)
assert {
@@ -634,7 +634,7 @@ class PodTemplateFileTest(unittest.TestCase):
assert {
"label1": "value1",
"label2": "value2",
- "release": "RELEASE-NAME",
+ "release": "release-name",
"component": "worker",
"tier": "airflow",
} == jmespath.search("metadata.labels", docs[0])
diff --git a/tests/charts/test_rbac.py b/tests/charts/test_rbac.py
index bd75de3081..16d851b197 100644
--- a/tests/charts/test_rbac.py
+++ b/tests/charts/test_rbac.py
@@ -23,58 +23,58 @@ from parameterized import parameterized
from tests.charts.helm_template_generator import render_chart
DEPLOYMENT_NO_RBAC_NO_SA_KIND_NAME_TUPLES = [
- ('Secret', 'TEST-RBAC-postgresql'),
- ('Secret', 'TEST-RBAC-airflow-metadata'),
- ('Secret', 'TEST-RBAC-pgbouncer-config'),
- ('Secret', 'TEST-RBAC-pgbouncer-stats'),
- ('ConfigMap', 'TEST-RBAC-airflow-config'),
- ('Service', 'TEST-RBAC-postgresql-headless'),
- ('Service', 'TEST-RBAC-postgresql'),
- ('Service', 'TEST-RBAC-statsd'),
- ('Service', 'TEST-RBAC-webserver'),
- ('Service', 'TEST-RBAC-flower'),
- ('Service', 'TEST-RBAC-pgbouncer'),
- ('Service', 'TEST-RBAC-redis'),
- ('Service', 'TEST-RBAC-worker'),
- ('Deployment', 'TEST-RBAC-scheduler'),
- ('Deployment', 'TEST-RBAC-statsd'),
- ('Deployment', 'TEST-RBAC-webserver'),
- ('Deployment', 'TEST-RBAC-flower'),
- ('Deployment', 'TEST-RBAC-pgbouncer'),
- ('Deployment', 'TEST-RBAC-triggerer'),
- ('StatefulSet', 'TEST-RBAC-postgresql'),
- ('StatefulSet', 'TEST-RBAC-redis'),
- ('StatefulSet', 'TEST-RBAC-worker'),
- ('Secret', 'TEST-RBAC-broker-url'),
- ('Secret', 'TEST-RBAC-fernet-key'),
- ('Secret', 'TEST-RBAC-redis-password'),
- ('Secret', 'TEST-RBAC-webserver-secret-key'),
- ('Job', 'TEST-RBAC-create-user'),
- ('Job', 'TEST-RBAC-run-airflow-migrations'),
- ('CronJob', 'TEST-RBAC-cleanup'),
+ ('Secret', 'test-rbac-postgresql'),
+ ('Secret', 'test-rbac-airflow-metadata'),
+ ('Secret', 'test-rbac-pgbouncer-config'),
+ ('Secret', 'test-rbac-pgbouncer-stats'),
+ ('ConfigMap', 'test-rbac-airflow-config'),
+ ('Service', 'test-rbac-postgresql-headless'),
+ ('Service', 'test-rbac-postgresql'),
+ ('Service', 'test-rbac-statsd'),
+ ('Service', 'test-rbac-webserver'),
+ ('Service', 'test-rbac-flower'),
+ ('Service', 'test-rbac-pgbouncer'),
+ ('Service', 'test-rbac-redis'),
+ ('Service', 'test-rbac-worker'),
+ ('Deployment', 'test-rbac-scheduler'),
+ ('Deployment', 'test-rbac-statsd'),
+ ('Deployment', 'test-rbac-webserver'),
+ ('Deployment', 'test-rbac-flower'),
+ ('Deployment', 'test-rbac-pgbouncer'),
+ ('Deployment', 'test-rbac-triggerer'),
+ ('StatefulSet', 'test-rbac-postgresql'),
+ ('StatefulSet', 'test-rbac-redis'),
+ ('StatefulSet', 'test-rbac-worker'),
+ ('Secret', 'test-rbac-broker-url'),
+ ('Secret', 'test-rbac-fernet-key'),
+ ('Secret', 'test-rbac-redis-password'),
+ ('Secret', 'test-rbac-webserver-secret-key'),
+ ('Job', 'test-rbac-create-user'),
+ ('Job', 'test-rbac-run-airflow-migrations'),
+ ('CronJob', 'test-rbac-cleanup'),
]
RBAC_ENABLED_KIND_NAME_TUPLES = [
- ('Role', 'TEST-RBAC-pod-launcher-role'),
- ('Role', 'TEST-RBAC-cleanup-role'),
- ('Role', 'TEST-RBAC-pod-log-reader-role'),
- ('RoleBinding', 'TEST-RBAC-pod-launcher-rolebinding'),
- ('RoleBinding', 'TEST-RBAC-pod-log-reader-rolebinding'),
- ('RoleBinding', 'TEST-RBAC-cleanup-rolebinding'),
+ ('Role', 'test-rbac-pod-launcher-role'),
+ ('Role', 'test-rbac-cleanup-role'),
+ ('Role', 'test-rbac-pod-log-reader-role'),
+ ('RoleBinding', 'test-rbac-pod-launcher-rolebinding'),
+ ('RoleBinding', 'test-rbac-pod-log-reader-rolebinding'),
+ ('RoleBinding', 'test-rbac-cleanup-rolebinding'),
]
SERVICE_ACCOUNT_NAME_TUPLES = [
- ('ServiceAccount', 'TEST-RBAC-cleanup'),
- ('ServiceAccount', 'TEST-RBAC-scheduler'),
- ('ServiceAccount', 'TEST-RBAC-webserver'),
- ('ServiceAccount', 'TEST-RBAC-worker'),
- ('ServiceAccount', 'TEST-RBAC-triggerer'),
- ('ServiceAccount', 'TEST-RBAC-pgbouncer'),
- ('ServiceAccount', 'TEST-RBAC-flower'),
- ('ServiceAccount', 'TEST-RBAC-statsd'),
- ('ServiceAccount', 'TEST-RBAC-create-user-job'),
- ('ServiceAccount', 'TEST-RBAC-migrate-database-job'),
- ('ServiceAccount', 'TEST-RBAC-redis'),
+ ('ServiceAccount', 'test-rbac-cleanup'),
+ ('ServiceAccount', 'test-rbac-scheduler'),
+ ('ServiceAccount', 'test-rbac-webserver'),
+ ('ServiceAccount', 'test-rbac-worker'),
+ ('ServiceAccount', 'test-rbac-triggerer'),
+ ('ServiceAccount', 'test-rbac-pgbouncer'),
+ ('ServiceAccount', 'test-rbac-flower'),
+ ('ServiceAccount', 'test-rbac-statsd'),
+ ('ServiceAccount', 'test-rbac-create-user-job'),
+ ('ServiceAccount', 'test-rbac-migrate-database-job'),
+ ('ServiceAccount', 'test-rbac-redis'),
]
CUSTOM_SERVICE_ACCOUNT_NAMES = (
@@ -114,17 +114,17 @@ class RBACTest(unittest.TestCase):
# TODO remove default from condition after airflow update
if version == "2.3.2" or version == "default":
return [
- ('Secret', 'TEST-RBAC-airflow-result-backend')
+ ('Secret', 'test-rbac-airflow-result-backend')
] + DEPLOYMENT_NO_RBAC_NO_SA_KIND_NAME_TUPLES
return DEPLOYMENT_NO_RBAC_NO_SA_KIND_NAME_TUPLES
@parameterized.expand(["2.3.2", "2.4.0", "default"])
def test_deployments_no_rbac_no_sa(self, version):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values=self._get_values_with_version(
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"rbac": {"create": False},
"cleanup": {
"enabled": True,
@@ -163,10 +163,10 @@ class RBACTest(unittest.TestCase):
@parameterized.expand(["2.3.2", "2.4.0", "default"])
def test_deployments_no_rbac_with_sa(self, version):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values=self._get_values_with_version(
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"rbac": {"create": False},
"cleanup": {"enabled": True},
"flower": {"enabled": True},
@@ -187,10 +187,10 @@ class RBACTest(unittest.TestCase):
@parameterized.expand(["2.3.2", "2.4.0", "default"])
def test_deployments_with_rbac_no_sa(self, version):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values=self._get_values_with_version(
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"cleanup": {
"enabled": True,
"serviceAccount": {
@@ -228,10 +228,10 @@ class RBACTest(unittest.TestCase):
@parameterized.expand(["2.3.2", "2.4.0", "default"])
def test_deployments_with_rbac_with_sa(self, version):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values=self._get_values_with_version(
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"cleanup": {"enabled": True},
"flower": {"enabled": True},
"pgbouncer": {"enabled": True},
@@ -252,9 +252,9 @@ class RBACTest(unittest.TestCase):
def test_service_account_custom_names(self):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"cleanup": {
"enabled": True,
"serviceAccount": {
@@ -290,9 +290,9 @@ class RBACTest(unittest.TestCase):
def test_service_account_custom_names_in_objects(self):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"cleanup": {
"enabled": True,
"serviceAccount": {
@@ -336,9 +336,9 @@ class RBACTest(unittest.TestCase):
def test_service_account_without_resource(self):
k8s_objects = render_chart(
- "TEST-RBAC",
+ "test-rbac",
values={
- "fullnameOverride": "TEST-RBAC",
+ "fullnameOverride": "test-rbac",
"executor": "LocalExecutor",
"cleanup": {"enabled": False},
"pgbouncer": {"enabled": False},
@@ -354,9 +354,9 @@ class RBACTest(unittest.TestCase):
if k8s_object['kind'] == "ServiceAccount"
]
service_account_names = [
- 'TEST-RBAC-scheduler',
- 'TEST-RBAC-webserver',
- 'TEST-RBAC-triggerer',
- 'TEST-RBAC-migrate-database-job',
+ 'test-rbac-scheduler',
+ 'test-rbac-webserver',
+ 'test-rbac-triggerer',
+ 'test-rbac-migrate-database-job',
]
self.assertCountEqual(list_of_sa_names, service_account_names)
diff --git a/tests/charts/test_rbac_pod_log_reader.py b/tests/charts/test_rbac_pod_log_reader.py
index 247bc404f2..08911b7852 100644
--- a/tests/charts/test_rbac_pod_log_reader.py
+++ b/tests/charts/test_rbac_pod_log_reader.py
@@ -26,9 +26,9 @@ class TestPodReader:
@pytest.mark.parametrize(
'triggerer, webserver, expected',
[
- (True, True, ['RELEASE-NAME-airflow-webserver', 'RELEASE-NAME-airflow-triggerer']),
- (True, False, ['RELEASE-NAME-airflow-triggerer']),
- (False, True, ['RELEASE-NAME-airflow-webserver']),
+ (True, True, ['release-name-airflow-webserver', 'release-name-airflow-triggerer']),
+ (True, False, ['release-name-airflow-triggerer']),
+ (False, True, ['release-name-airflow-webserver']),
(False, False, []),
],
)
@@ -46,9 +46,9 @@ class TestPodReader:
@pytest.mark.parametrize(
'triggerer, webserver, expected',
[
- (True, True, 'RELEASE-NAME-pod-log-reader-role'),
- (True, False, 'RELEASE-NAME-pod-log-reader-role'),
- (False, True, 'RELEASE-NAME-pod-log-reader-role'),
+ (True, True, 'release-name-pod-log-reader-role'),
+ (True, False, 'release-name-pod-log-reader-role'),
+ (False, True, 'release-name-pod-log-reader-role'),
(False, False, None),
],
)
diff --git a/tests/charts/test_redis.py b/tests/charts/test_redis.py
index 2659687c60..16fd63a247 100644
--- a/tests/charts/test_redis.py
+++ b/tests/charts/test_redis.py
@@ -26,7 +26,7 @@ from parameterized import parameterized
from tests.charts.helm_template_generator import prepare_k8s_lookup_dict, render_chart
-RELEASE_NAME_REDIS = "TEST-REDIS"
+RELEASE_NAME_REDIS = "test-redis"
REDIS_OBJECTS = {
"NETWORK_POLICY": ("NetworkPolicy", f"{RELEASE_NAME_REDIS}-redis-policy"),
@@ -135,7 +135,7 @@ class RedisTest(unittest.TestCase):
k8s_obj_by_key,
expected_password_match="test-redis-password",
expected_broker_url_match=re.escape(
- "redis://:test-redis-password%21%40%23$%25%5E&%2A%28%29_+@TEST-REDIS-redis:6379/0"
+ "redis://:test-redis-password%21%40%23$%25%5E&%2A%28%29_+@test-redis-redis:6379/0"
),
)
diff --git a/tests/charts/test_result_backend_connection_secret.py b/tests/charts/test_result_backend_connection_secret.py
index ba7cdd199f..91eaa48504 100644
--- a/tests/charts/test_result_backend_connection_secret.py
+++ b/tests/charts/test_result_backend_connection_secret.py
@@ -97,7 +97,7 @@ class ResultBackendConnectionSecretTest(unittest.TestCase):
self._assert_for_old_version(
version,
value=connection,
- expected_value="db+postgresql://postgres:postgres@RELEASE-NAME"
+ expected_value="db+postgresql://postgres:postgres@release-name"
"-postgresql:5432/postgres?sslmode=disable",
)
@@ -113,8 +113,8 @@ class ResultBackendConnectionSecretTest(unittest.TestCase):
self._assert_for_old_version(
version,
value=connection,
- expected_value="db+postgresql://someuser:somepass@RELEASE-NAME-pgbouncer"
- ":6543/RELEASE-NAME-result-backend?sslmode=allow",
+ expected_value="db+postgresql://someuser:somepass@release-name-pgbouncer"
+ ":6543/release-name-result-backend?sslmode=allow",
)
@parameterized.expand(["2.3.2", "2.4.0", "default"])
@@ -126,8 +126,8 @@ class ResultBackendConnectionSecretTest(unittest.TestCase):
self._assert_for_old_version(
version,
value=connection,
- expected_value="db+postgresql://postgres:postgres@RELEASE-NAME-pgbouncer"
- ":6543/RELEASE-NAME-result-backend?sslmode=disable",
+ expected_value="db+postgresql://postgres:postgres@release-name-pgbouncer"
+ ":6543/release-name-result-backend?sslmode=disable",
)
def test_should_set_pgbouncer_overrides_with_non_chart_database_when_enabled(self):
@@ -139,8 +139,8 @@ class ResultBackendConnectionSecretTest(unittest.TestCase):
# host, port, dbname still get overridden even with an non-chart db
assert (
- "db+postgresql://someuser:somepass@RELEASE-NAME-pgbouncer:6543"
- "/RELEASE-NAME-result-backend?sslmode=allow" == connection
+ "db+postgresql://someuser:somepass@release-name-pgbouncer:6543"
+ "/release-name-result-backend?sslmode=allow" == connection
)
@parameterized.expand(["2.3.2", "2.4.0", "default"])
diff --git a/tests/charts/test_scc_rolebinding.py b/tests/charts/test_scc_rolebinding.py
index 1b7b3d8625..0b4eae0996 100644
--- a/tests/charts/test_scc_rolebinding.py
+++ b/tests/charts/test_scc_rolebinding.py
@@ -47,17 +47,17 @@ class TestSCCActivation:
if created:
assert "RoleBinding" == jmespath.search("kind", docs[0])
assert "ClusterRole" == jmespath.search("roleRef.kind", docs[0])
- assert "RELEASE-NAME-scc-rolebinding" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-scc-rolebinding" == jmespath.search("metadata.name", docs[0])
assert "system:openshift:scc:anyuid" == jmespath.search("roleRef.name", docs[0])
- assert "RELEASE-NAME-airflow-webserver" == jmespath.search("subjects[0].name", docs[0])
- assert "RELEASE-NAME-airflow-worker" == jmespath.search("subjects[1].name", docs[0])
- assert "RELEASE-NAME-airflow-scheduler" == jmespath.search("subjects[2].name", docs[0])
- assert "RELEASE-NAME-airflow-statsd" == jmespath.search("subjects[3].name", docs[0])
- assert "RELEASE-NAME-airflow-flower" == jmespath.search("subjects[4].name", docs[0])
- assert "RELEASE-NAME-airflow-triggerer" == jmespath.search("subjects[5].name", docs[0])
- assert "RELEASE-NAME-airflow-migrate-database-job" == jmespath.search("subjects[6].name", docs[0])
- assert "RELEASE-NAME-airflow-create-user-job" == jmespath.search("subjects[7].name", docs[0])
- assert "RELEASE-NAME-airflow-cleanup" == jmespath.search("subjects[8].name", docs[0])
+ assert "release-name-airflow-webserver" == jmespath.search("subjects[0].name", docs[0])
+ assert "release-name-airflow-worker" == jmespath.search("subjects[1].name", docs[0])
+ assert "release-name-airflow-scheduler" == jmespath.search("subjects[2].name", docs[0])
+ assert "release-name-airflow-statsd" == jmespath.search("subjects[3].name", docs[0])
+ assert "release-name-airflow-flower" == jmespath.search("subjects[4].name", docs[0])
+ assert "release-name-airflow-triggerer" == jmespath.search("subjects[5].name", docs[0])
+ assert "release-name-airflow-migrate-database-job" == jmespath.search("subjects[6].name", docs[0])
+ assert "release-name-airflow-create-user-job" == jmespath.search("subjects[7].name", docs[0])
+ assert "release-name-airflow-cleanup" == jmespath.search("subjects[8].name", docs[0])
@pytest.mark.parametrize(
"rbac_enabled,scc_enabled,created",
@@ -81,7 +81,7 @@ class TestSCCActivation:
if created:
assert "ClusterRoleBinding" == jmespath.search("kind", docs[0])
assert "ClusterRole" == jmespath.search("roleRef.kind", docs[0])
- assert "RELEASE-NAME-scc-rolebinding" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-scc-rolebinding" == jmespath.search("metadata.name", docs[0])
assert "system:openshift:scc:anyuid" == jmespath.search("roleRef.name", docs[0])
@pytest.mark.parametrize(
@@ -107,10 +107,10 @@ class TestSCCActivation:
if created:
assert "RoleBinding" == jmespath.search("kind", docs[0])
assert "ClusterRole" == jmespath.search("roleRef.kind", docs[0])
- assert "RELEASE-NAME-scc-rolebinding" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-scc-rolebinding" == jmespath.search("metadata.name", docs[0])
assert "system:openshift:scc:anyuid" == jmespath.search("roleRef.name", docs[0])
- assert "RELEASE-NAME-airflow-webserver" == jmespath.search("subjects[0].name", docs[0])
- assert "RELEASE-NAME-airflow-worker" == jmespath.search("subjects[1].name", docs[0])
- assert "RELEASE-NAME-airflow-scheduler" == jmespath.search("subjects[2].name", docs[0])
- assert "RELEASE-NAME-airflow-triggerer" == jmespath.search("subjects[3].name", docs[0])
- assert "RELEASE-NAME-airflow-migrate-database-job" == jmespath.search("subjects[4].name", docs[0])
+ assert "release-name-airflow-webserver" == jmespath.search("subjects[0].name", docs[0])
+ assert "release-name-airflow-worker" == jmespath.search("subjects[1].name", docs[0])
+ assert "release-name-airflow-scheduler" == jmespath.search("subjects[2].name", docs[0])
+ assert "release-name-airflow-triggerer" == jmespath.search("subjects[3].name", docs[0])
+ assert "release-name-airflow-migrate-database-job" == jmespath.search("subjects[4].name", docs[0])
diff --git a/tests/charts/test_scheduler.py b/tests/charts/test_scheduler.py
index c6cc17381f..0cad0fb613 100644
--- a/tests/charts/test_scheduler.py
+++ b/tests/charts/test_scheduler.py
@@ -289,7 +289,7 @@ class SchedulerTest(unittest.TestCase):
@parameterized.expand(
[
({"enabled": False}, {"emptyDir": {}}),
- ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "RELEASE-NAME-logs"}}),
+ ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "release-name-logs"}}),
(
{"enabled": True, "existingClaim": "test-claim"},
{"persistentVolumeClaim": {"claimName": "test-claim"}},
@@ -452,7 +452,7 @@ class SchedulerTest(unittest.TestCase):
show_only=["templates/scheduler/scheduler-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_log_groomer_collector_can_be_disabled(self):
@@ -506,7 +506,7 @@ class SchedulerTest(unittest.TestCase):
show_only=["templates/scheduler/scheduler-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[1].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[1].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[1].args", docs[0])
@parameterized.expand(
diff --git a/tests/charts/test_statsd.py b/tests/charts/test_statsd.py
index 725340a3cf..5ca2353d16 100644
--- a/tests/charts/test_statsd.py
+++ b/tests/charts/test_statsd.py
@@ -27,7 +27,7 @@ class StatsdTest(unittest.TestCase):
def test_should_create_statsd_default(self):
docs = render_chart(show_only=["templates/statsd/statsd-deployment.yaml"])
- assert "RELEASE-NAME-statsd" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-statsd" == jmespath.search("metadata.name", docs[0])
assert "statsd" == jmespath.search("spec.template.spec.containers[0].name", docs[0])
@@ -42,7 +42,7 @@ class StatsdTest(unittest.TestCase):
show_only=["templates/statsd/statsd-deployment.yaml"],
)
- assert {"name": "config", "configMap": {"name": "RELEASE-NAME-statsd"}} in jmespath.search(
+ assert {"name": "config", "configMap": {"name": "release-name-statsd"}} in jmespath.search(
"spec.template.spec.volumes", docs[0]
)
diff --git a/tests/charts/test_triggerer.py b/tests/charts/test_triggerer.py
index 0436a861e2..c22403496a 100644
--- a/tests/charts/test_triggerer.py
+++ b/tests/charts/test_triggerer.py
@@ -292,7 +292,7 @@ class TriggererTest(unittest.TestCase):
@parameterized.expand(
[
({"enabled": False}, {"emptyDir": {}}),
- ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "RELEASE-NAME-logs"}}),
+ ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "release-name-logs"}}),
(
{"enabled": True, "existingClaim": "test-claim"},
{"persistentVolumeClaim": {"claimName": "test-claim"}},
@@ -400,7 +400,7 @@ class TriggererTest(unittest.TestCase):
show_only=["templates/triggerer/triggerer-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_dags_gitsync_sidecar_and_init_container(self):
diff --git a/tests/charts/test_webserver.py b/tests/charts/test_webserver.py
index 0664fa2e43..0326fb52ed 100644
--- a/tests/charts/test_webserver.py
+++ b/tests/charts/test_webserver.py
@@ -106,14 +106,14 @@ class WebserverDeploymentTest(unittest.TestCase):
)
container = jmespath.search("spec.template.spec.containers[0]", docs[0])
- assert {"name": "Host", "value": "RELEASE-NAME.com"} in jmespath.search(
+ assert {"name": "Host", "value": "release-name.com"} in jmespath.search(
"livenessProbe.httpGet.httpHeaders", container
)
- assert {"name": "Host", "value": "RELEASE-NAME.com"} in jmespath.search(
+ assert {"name": "Host", "value": "release-name.com"} in jmespath.search(
"readinessProbe.httpGet.httpHeaders", container
)
- assert "/mypath/RELEASE-NAME/path/health" == jmespath.search("livenessProbe.httpGet.path", container)
- assert "/mypath/RELEASE-NAME/path/health" == jmespath.search("readinessProbe.httpGet.path", container)
+ assert "/mypath/release-name/path/health" == jmespath.search("livenessProbe.httpGet.path", container)
+ assert "/mypath/release-name/path/health" == jmespath.search("readinessProbe.httpGet.path", container)
def test_should_add_scheme_to_liveness_and_readiness_probes(self):
docs = render_chart(
@@ -141,7 +141,7 @@ class WebserverDeploymentTest(unittest.TestCase):
assert {
"name": "webserver-config",
- "configMap": {"name": "RELEASE-NAME-webserver-config"},
+ "configMap": {"name": "release-name-webserver-config"},
} in jmespath.search("spec.template.spec.volumes", docs[0])
assert {
@@ -346,7 +346,7 @@ class WebserverDeploymentTest(unittest.TestCase):
@parameterized.expand(
[
({"enabled": False}, None),
- ({"enabled": True}, "RELEASE-NAME-logs"),
+ ({"enabled": True}, "release-name-logs"),
({"enabled": True, "existingClaim": "test-claim"}, "test-claim"),
]
)
@@ -519,7 +519,7 @@ class WebserverDeploymentTest(unittest.TestCase):
show_only=["templates/webserver/webserver-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
@parameterized.expand(
@@ -579,9 +579,9 @@ class WebserverDeploymentTest(unittest.TestCase):
@parameterized.expand(
[
- ({"persistence": {"enabled": True}}, "RELEASE-NAME-dags"),
+ ({"persistence": {"enabled": True}}, "release-name-dags"),
({"persistence": {"enabled": True, "existingClaim": "test-claim"}}, "test-claim"),
- ({"persistence": {"enabled": True}, "gitSync": {"enabled": True}}, "RELEASE-NAME-dags"),
+ ({"persistence": {"enabled": True}, "gitSync": {"enabled": True}}, "release-name-dags"),
]
)
def test_dags_persistence_volume_no_sidecar(self, dags_values, expected_claim_name):
@@ -605,9 +605,9 @@ class WebserverServiceTest(unittest.TestCase):
show_only=["templates/webserver/webserver-service.yaml"],
)
- assert "RELEASE-NAME-webserver" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-webserver" == jmespath.search("metadata.name", docs[0])
assert jmespath.search("metadata.annotations", docs[0]) is None
- assert {"tier": "airflow", "component": "webserver", "release": "RELEASE-NAME"} == jmespath.search(
+ assert {"tier": "airflow", "component": "webserver", "release": "release-name"} == jmespath.search(
"spec.selector", docs[0]
)
assert "ClusterIP" == jmespath.search("spec.type", docs[0])
@@ -640,7 +640,7 @@ class WebserverServiceTest(unittest.TestCase):
([{"port": 8888}], [{"port": 8888}]), # name is optional with a single port
(
[{"name": "{{ .Release.Name }}", "protocol": "UDP", "port": "{{ .Values.ports.airflowUI }}"}],
- [{"name": "RELEASE-NAME", "protocol": "UDP", "port": 8080}],
+ [{"name": "release-name", "protocol": "UDP", "port": 8080}],
),
([{"name": "only_sidecar", "port": "{{ int 9000 }}"}], [{"name": "only_sidecar", "port": 9000}]),
(
@@ -678,9 +678,9 @@ class WebserverConfigmapTest(unittest.TestCase):
)
assert "ConfigMap" == docs[0]["kind"]
- assert "RELEASE-NAME-webserver-config" == jmespath.search("metadata.name", docs[0])
+ assert "release-name-webserver-config" == jmespath.search("metadata.name", docs[0])
assert (
- "CSRF_ENABLED = True # RELEASE-NAME"
+ "CSRF_ENABLED = True # release-name"
== jmespath.search('data."webserver_config.py"', docs[0]).strip()
)
diff --git a/tests/charts/test_worker.py b/tests/charts/test_worker.py
index 3f3a2572e2..5f3fbd3986 100644
--- a/tests/charts/test_worker.py
+++ b/tests/charts/test_worker.py
@@ -300,7 +300,7 @@ class WorkerTest(unittest.TestCase):
@parameterized.expand(
[
({"enabled": False}, {"emptyDir": {}}),
- ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "RELEASE-NAME-logs"}}),
+ ({"enabled": True}, {"persistentVolumeClaim": {"claimName": "release-name-logs"}}),
(
{"enabled": True, "existingClaim": "test-claim"},
{"persistentVolumeClaim": {"claimName": "test-claim"}},
@@ -439,7 +439,7 @@ class WorkerTest(unittest.TestCase):
show_only=["templates/workers/worker-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[0].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[0].args", docs[0])
def test_log_groomer_default_command_and_args(self):
@@ -486,7 +486,7 @@ class WorkerTest(unittest.TestCase):
show_only=["templates/workers/worker-deployment.yaml"],
)
- assert ["RELEASE-NAME"] == jmespath.search("spec.template.spec.containers[1].command", docs[0])
+ assert ["release-name"] == jmespath.search("spec.template.spec.containers[1].command", docs[0])
assert ["Helm"] == jmespath.search("spec.template.spec.containers[1].args", docs[0])
@parameterized.expand(