uplsh580 commented on code in PR #60750:
URL: https://github.com/apache/airflow/pull/60750#discussion_r2936675749
##########
chart/templates/_helpers.yaml:
##########
@@ -1063,111 +1185,3 @@ Usage:
{{- end -}}
{{- $result -}}
{{- end -}}
-
-{{/*
-Determine if the create-user job should be enabled.
-When webserver.defaultUser is set (deprecated), it takes precedence to preserve
-backwards compatibility. Otherwise, fall back to createUserJob.enabled.
-*/}}
-{{- define "createUserJob.isEnabled" -}}
- {{- if .Values.webserver.defaultUser -}}
- {{- .Values.webserver.defaultUser.enabled -}}
- {{- else -}}
- {{- .Values.createUserJob.enabled -}}
- {{- end -}}
-{{- end -}}
-
-{{/*
-Convert dagBundleConfigList YAML list to JSON string for
dag_bundle_config_list.
-This helper function converts the structured YAML format to the JSON string
-format required by Airflow's dag_bundle_config_list configuration.
-
-Usage:
- config:
- dag_processor:
- dag_bundle_config_list: '{{ include "dag_bundle_config_list" . }}'
-*/}}
-{{- define "dag_bundle_config_list" -}}
- {{- if .Values.dagProcessor.dagBundleConfigList -}}
- {{- $bundles := list -}}
- {{- range .Values.dagProcessor.dagBundleConfigList -}}
- {{- $bundle := dict "name" .name "classpath" .classpath "kwargs"
(.kwargs | default dict) -}}
- {{- $bundles = append $bundles $bundle -}}
- {{- end -}}
- {{- $bundles | toJson -}}
- {{- else -}}
- {{- "[]" -}}
- {{- end -}}
-{{- end }}
-
-{{/*
-Custom merge function which enables full map overwrite and `or` logic for
boolean overwrite.
-It takes 4 arguments where:
- 1. Input map (source for merge)
- 2. Input map with values which will overwrite values from first map
- 3. Root section name (used for `or` boolean logic)
- 4. List of section names for which logic for boolean parameters should be
`or` instead of overwrite
-
-Usage:
- {{ include "workersMergeValues" (list .Values.workers .Values.workers.celery
"" (list "kerberosInitContainer")) }}
-*/}}
-{{- define "workersMergeValues" -}}
- {{- $inputMap := index . 0 -}}
- {{- $overwriteMap := index . 1 -}}
- {{- $sectionName := index . 2 -}}
- {{- $orBoolean := index . 3 -}}
- {{- $outputMap := dict -}}
-
- {{- $fullOverwrite := list "annotations" "podAnnotations"
"persistentVolumeClaimRetentionPolicy" "pod" "container" "securityContext"
"containerLifecycleHooks" "config" "advanced" "behavior" "resources"
"nodeSelector" "affinity" "labels" -}}
-
- {{- range $key, $val := $inputMap -}}
- {{/* Below if holds logic for full overwrite map logic */}}
- {{- if and (hasKey $overwriteMap $key) (has $key $fullOverwrite) -}}
- {{- $_ := set $outputMap $key (get $overwriteMap $key) -}}
Review Comment:
@jscheffl
Addressed. I've removed the AIRFLOW__KUBERNETES_ENVIRONMENT_VARIABLES__
prefix for .Values.env and the AIRFLOW__KUBERNETES_SECRETS__ prefix for
.Values.secret from custom_airflow_environment (around lines 157+). The
newsfragment has been updated accordingly.
-
https://github.com/apache/airflow/pull/60750/commits/f5fa08bd8359501af66c1225283c504bb0fb2cf8
-
https://github.com/apache/airflow/pull/60750/commits/2caf77c3649b5955e78d65a0ebbf8aee30703a3f
--
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]
