Page MenuHomePhabricator
Paste P95860

Detect ID
ActivePublic
Actions

Authored by atsuko on Aug 4 2026, 10:29 AM.
Project Tags
None
Referenced Files
F97139225: Detect ID
Aug 4 2026, 10:29 AM
Subscribers
None
From bf539fd6e7b059eceaf78dfaf12770677147cc7e Mon Sep 17 00:00:00 2001
From: Atsuko Ito <atsuko@wikimedia.org>
Date: Tue, 4 Aug 2026 10:47:26 +0100
Subject: [PATCH 2/2] id
---
charts/airflow/templates/_deployment.yaml.tpl | 6 +++---
charts/airflow/templates/_helpers.tpl | 14 ++++++++++----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/charts/airflow/templates/_deployment.yaml.tpl b/charts/airflow/templates/_deployment.yaml.tpl
index 14eed2ac1..7fb6c4e4a 100644
--- a/charts/airflow/templates/_deployment.yaml.tpl
+++ b/charts/airflow/templates/_deployment.yaml.tpl
@@ -29,7 +29,7 @@ spec:
args: ["db", "migrate"]
image: {{ template "app.generic._image" . }}
imagePullPolicy: {{ .Values.docker.pull_policy }}
- {{- include "app.airflow.env" . | indent 8 }}
+ {{- include "app.airflow.env" (dict "Root" . "id" "initContainer") | indent 8 }}
{{- include "base.helper.restrictedSecurityContext" . | nindent 8 }}
{{- include "base.helper.resources" .Values.app | indent 8 }}
volumeMounts:
@@ -189,7 +189,7 @@ spec:
time.sleep(5)
image: {{ template "app.generic._image" . }}
imagePullPolicy: {{ .Values.docker.pull_policy }}
- {{- include "app.airflow.env" . | indent 8 }}
+ {{- include "app.airflow.env" (dict "Root" . "id" "kerberos-init") | indent 8 }}
{{- include "base.helper.restrictedSecurityContext" . | nindent 8 }}
{{- include "base.helper.resources" $.Values.kerberos.resources | indent 8 }}
volumeMounts:
@@ -218,7 +218,7 @@ spec:
{{- end }}
image: {{ template "app.generic._image" . }}
imagePullPolicy: {{ .Values.docker.pull_policy }}
- {{- include "app.airflow.env" . | indent 8 }}
+ {{- include "app.airflow.env" (dict "Root" . "id" "kerberos") | indent 8 }}
{{- include "base.helper.restrictedSecurityContext" . | nindent 8 }}
{{- include "base.helper.resources" $.Values.kerberos.resources | indent 8 }}
volumeMounts:
diff --git a/charts/airflow/templates/_helpers.tpl b/charts/airflow/templates/_helpers.tpl
index 8bf822617..ecb18d272 100644
--- a/charts/airflow/templates/_helpers.tpl
+++ b/charts/airflow/templates/_helpers.tpl
@@ -23,7 +23,7 @@
readinessProbe:
{{- toYaml . | nindent 4 }}
{{- end }}
- {{- include "app.airflow.env" . | indent 2 }}
+ {{- include "app.airflow.env" (dict "Root" . "id" "container") | indent 2 }}
{{- include "base.helper.resources" .Values.app | indent 2 }}
{{- include "base.helper.restrictedSecurityContext" . | indent 2 }}
volumeMounts:
@@ -50,7 +50,7 @@
readinessProbe:
{{- toYaml . | nindent 4 }}
{{- end }}
- {{- include "app.airflow.env" .Root | indent 2 }}
+ {{- include "app.airflow.env" (dict "Root" .Root "id" "scheduler") | indent 2 }}
{{- if has "LocalExecutor" .profiles }}
{{- include "app.airflow.env.hadoop" .Root | indent 2 }}
{{- end }}
@@ -88,10 +88,16 @@
{{- end }}
{{- define "app.airflow.env" }}
-{{- $krbPrincipal := include "evalValue" (dict "value" $.Values.config.airflow.config.kerberos.principal "Root" $) }}
env:
+- name: ID
+ value: {{ $.id }}
+{{- include "app.airflow.realenv" .Root }}
+{{- end }}
+
+{{- define "app.airflow.realenv" }}
- name: SERVICE_IDENTIFIER
value: {{ template "base.name.release" . }}
+{{- $krbPrincipal := include "evalValue" (dict "value" $.Values.config.airflow.config.kerberos.principal "Root" $) }}
{{- range $k, $v := .Values.config.public }}
- name: {{ $k | upper }}
value: {{ $v | quote }}
@@ -449,7 +455,7 @@ spec:
- name: base
image: {{ template "executor_pod._image" .Root }}
imagePullPolicy: IfNotPresent
- {{- include "app.airflow.env" .Root | indent 4 }}
+ {{- include "app.airflow.env" (dict "Root" .Root "id" "taskpod") | indent 4 }}
{{- include "airflow.task-pod.env" (dict "Root" .Root "header" false "profiles" $profiles) | indent 4 }}
{{- include "airflow.task-pod.volumeMounts" (dict "Root" .Root "profiles" $profiles) | indent 4 }}
{{- if has "kubeapi" $profiles }}
--
2.47.3
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits