Miretpl commented on code in PR #72555:
URL: https://github.com/apache/airflow/pull/72555#discussion_r3972867371
##########
chart/files/pod-template-file.kubernetes-helm-yaml:
##########
@@ -101,6 +101,62 @@ spec:
{{- include "custom_airflow_environment" . | indent 6 }}
{{- include "standard_airflow_environment" . | indent 6 }}
{{- end }}
+ {{- if .Values.workers.kubernetes.kerberosSidecar.enabled }}
Review Comment:
We have `kerberos-init`, and with that addition, we have duplication of
work. We should have only one Kerberos init container, which will keep running
as sidecar after first successful run (startup probe will run successfully).
##########
chart/templates/workers/worker-deployment.yaml:
##########
@@ -262,6 +262,61 @@ spec:
{{- if .Values.workers.celery.extraInitContainers }}
{{- tpl (toYaml .Values.workers.celery.extraInitContainers) . |
nindent 8 }}
{{- end }}
+ {{- if .Values.workers.celery.kerberosSidecar.enabled }}
Review Comment:
Same as the comment above.
##########
chart/tests/helm_tests/airflow_aux/test_pod_template_file.py:
##########
@@ -1293,6 +1296,68 @@ def
test_runtime_class_name_values_are_configurable(self):
assert jmespath.search("spec.runtimeClassName", docs[0]) == "nvidia"
+ def test_kerberos_sidecar_is_native_sidecar(self):
+ docs = render_chart(
+ values={"workers": {"kubernetes": {"kerberosSidecar": {"enabled":
True}}}},
+ show_only=["templates/pod-template-file.yaml"],
+ chart_dir=self.temp_chart_dir,
+ )
+ sidecar =
jmespath.search("spec.initContainers[?name=='worker-kerberos'] | [0]", docs[0])
+ assert sidecar is not None
+ assert sidecar["restartPolicy"] == "Always"
+ assert jmespath.search("spec.containers[?name=='worker-kerberos'] |
[0]", docs[0]) is None
+
+ def test_kerberos_init_and_sidecar_coexistence(self):
+ docs = render_chart(
+ values={
+ "workers": {
+ "kubernetes": {
+ "kerberosInitContainer": {"enabled": True},
+ "kerberosSidecar": {"enabled": True},
+ }
+ }
+ },
+ show_only=["templates/pod-template-file.yaml"],
+ chart_dir=self.temp_chart_dir,
+ )
+ init_containers = jmespath.search("spec.initContainers", docs[0])
+ init_names = [c["name"] for c in init_containers]
+ assert "kerberos-init" in init_names
+ assert "worker-kerberos" in init_names
+ assert init_names.index("kerberos-init") <
init_names.index("worker-kerberos")
+ assert init_containers[-1]["name"] == "worker-kerberos"
+
+ kerberos_init =
jmespath.search("spec.initContainers[?name=='kerberos-init'] | [0]", docs[0])
+ worker_kerberos =
jmespath.search("spec.initContainers[?name=='worker-kerberos'] | [0]", docs[0])
+ assert "restartPolicy" not in kerberos_init
+ assert worker_kerberos.get("restartPolicy") == "Always"
+
+ def test_pod_override_reconciliation_with_kerberos_sidecar(self):
+ docs = render_chart(
+ values={"workers": {"kubernetes": {"kerberosSidecar": {"enabled":
True}}}},
+ show_only=["templates/pod-template-file.yaml"],
+ chart_dir=self.temp_chart_dir,
+ )
+ base_pod = PodGenerator.deserialize_model_dict(docs[0])
+ override_pod = k8s.V1Pod(
+ spec=k8s.V1PodSpec(
+ containers=[
+ k8s.V1Container(name="base"),
+ k8s.V1Container(name="custom-container",
image="custom-image:latest"),
+ ]
+ )
+ )
+ reconciled = PodGenerator.reconcile_pods(base_pod, override_pod)
+
+ sidecars = [c for c in reconciled.spec.init_containers if c.name ==
"worker-kerberos"]
+ assert len(sidecars) == 1
+ assert sidecars[0].restart_policy == "Always"
+
+ custom_containers = [c for c in reconciled.spec.containers if c.name
== "custom-container"]
+ assert len(custom_containers) == 1
+ assert custom_containers[0].image == "custom-image:latest"
+ assert custom_containers[0].args is None
Review Comment:
In all other test cases, when we have a similar need, we just use jmspath.
Could you adjust it?
--
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]
