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 dd627d7f46 36888-Fix k8 configmap issue in 7.14.0rc1 (#37001)
dd627d7f46 is described below
commit dd627d7f4605d2918395b7e9ca9baaa62c9724d4
Author: vizeit <44128024+viz...@users.noreply.github.com>
AuthorDate: Thu Jan 25 16:32:20 2024 -0800
36888-Fix k8 configmap issue in 7.14.0rc1 (#37001)
---
airflow/providers/cncf/kubernetes/operators/pod.py | 11 +++++++----
tests/providers/cncf/kubernetes/operators/test_pod.py | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/airflow/providers/cncf/kubernetes/operators/pod.py
b/airflow/providers/cncf/kubernetes/operators/pod.py
index 4caa37b6ef..693932f022 100644
--- a/airflow/providers/cncf/kubernetes/operators/pod.py
+++ b/airflow/providers/cncf/kubernetes/operators/pod.py
@@ -230,7 +230,7 @@ class KubernetesPodOperator(BaseOperator):
"volumes",
"volume_mounts",
"cluster_context",
- "configmaps",
+ "env_from",
)
template_fields_renderers = {"env_vars": "py"}
@@ -313,9 +313,8 @@ class KubernetesPodOperator(BaseOperator):
if pod_runtime_info_envs:
self.env_vars.extend([convert_pod_runtime_info_env(p) for p in
pod_runtime_info_envs])
self.env_from = env_from or []
- self.configmaps = configmaps
- if self.configmaps:
- self.env_from.extend([convert_configmap(c) for c in
self.configmaps])
+ if configmaps:
+ self.env_from.extend([convert_configmap(c) for c in configmaps])
self.ports = [convert_port(p) for p in ports] if ports else []
self.volume_mounts = [convert_volume_mount(v) for v in volume_mounts]
if volume_mounts else []
self.volumes = [convert_volume(volume) for volume in volumes] if
volumes else []
@@ -420,6 +419,10 @@ class KubernetesPodOperator(BaseOperator):
template_fields = ("claim_name",)
elif isinstance(content, k8s.V1ConfigMapVolumeSource):
template_fields = ("name",)
+ elif isinstance(content, k8s.V1EnvFromSource):
+ template_fields = ("config_map_ref",)
+ elif isinstance(content, k8s.V1ConfigMapEnvSource):
+ template_fields = ("name",)
else:
template_fields = None
diff --git a/tests/providers/cncf/kubernetes/operators/test_pod.py
b/tests/providers/cncf/kubernetes/operators/test_pod.py
index 5da60fabfa..b896f57ee5 100644
--- a/tests/providers/cncf/kubernetes/operators/test_pod.py
+++ b/tests/providers/cncf/kubernetes/operators/test_pod.py
@@ -179,7 +179,7 @@ class TestKubernetesPodOperator:
assert dag_id == ti.task.arguments
assert dag_id == ti.task.env_vars[0]
assert dag_id == rendered.annotations["dag-id"]
- assert dag_id == ti.task.configmaps[0]
+ assert dag_id == ti.task.env_from[0].config_map_ref.name
assert dag_id == rendered.volumes[0].name
assert dag_id == rendered.volumes[0].config_map.name
