Skip to content

Fix defaultAirflowRepository comment #23568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Dris101 wants to merge 3 commits into from
Closed

Fix defaultAirflowRepository comment #23568

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3099aea
Fix defaultAirflowRepository comment
May 8, 2022
b8f0671
Fix defaultAirflowRepository comment
potiuk May 7, 2022
e547046
Merge branch 'fix-defaultAirflowRepository-comment' of https://github…
May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ securityContext: {}
# Used for mount paths
airflowHome: /opt/airflow

# Default airflow repository -- overrides all the specific images below
# Default airflow repository -- overridden by all the specific images below

@kaxil kaxil May 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you undo all the other formatting changes except this one please -- let's us keep the git history better

@Dris101 Dris101 May 11, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, Had "format on save" turned on. What's the cleanest way to do that? Undo the last commit on my topic branch, revise and re-push?

@kaxil kaxil May 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah :)

defaultAirflowRepository: apache/airflow

# Default airflow tag to deploy
Expand Down Expand Up @@ -1406,8 +1406,12 @@ cleanup:
# Command to use when running the cleanup cronjob (templated).
command: ~
# Args to use when running the cleanup cronjob (templated).
args: ["bash", "-c", "exec airflow kubernetes cleanup-pods --namespace={{ .Release.Namespace }}"]

args:
[
"bash",
"-c",
"exec airflow kubernetes cleanup-pods --namespace={{ .Release.Namespace }}",
]

# Select certain nodes for airflow cleanup pods.
nodeSelector: {}
Expand Down Expand Up @@ -1462,23 +1466,23 @@ config:
core:
dags_folder: '{{ include "airflow_dags" . }}'
# This is ignored when used with the official Docker image
load_examples: 'False'
executor: '{{ .Values.executor }}'
load_examples: "False"
executor: "{{ .Values.executor }}"
# For Airflow 1.10, backward compatibility; moved to [logging] in 2.0
colored_console_log: 'False'
colored_console_log: "False"
remote_logging: '{{- ternary "True" "False" .Values.elasticsearch.enabled }}'
logging:
remote_logging: '{{- ternary "True" "False" .Values.elasticsearch.enabled }}'
colored_console_log: 'False'
colored_console_log: "False"
metrics:
statsd_on: '{{ ternary "True" "False" .Values.statsd.enabled }}'
statsd_port: 9125
statsd_prefix: airflow
statsd_host: '{{ printf "%s-statsd" .Release.Name }}'
webserver:
enable_proxy_fix: 'True'
enable_proxy_fix: "True"
# For Airflow 1.10
rbac: 'True'
rbac: "True"
celery:
worker_concurrency: 16
scheduler:
Expand All @@ -1490,27 +1494,27 @@ config:
# `run_duration` included for Airflow 1.10 backward compatibility; removed in 2.0.
run_duration: 41460
elasticsearch:
json_format: 'True'
json_format: "True"
log_id_template: "{dag_id}_{task_id}_{execution_date}_{try_number}"
elasticsearch_configs:
max_retries: 3
timeout: 30
retry_timeout: 'True'
retry_timeout: "True"
kerberos:
keytab: '{{ .Values.kerberos.keytabPath }}'
reinit_frequency: '{{ .Values.kerberos.reinitFrequency }}'
principal: '{{ .Values.kerberos.principal }}'
ccache: '{{ .Values.kerberos.ccacheMountPath }}/{{ .Values.kerberos.ccacheFileName }}'
keytab: "{{ .Values.kerberos.keytabPath }}"
reinit_frequency: "{{ .Values.kerberos.reinitFrequency }}"
principal: "{{ .Values.kerberos.principal }}"
ccache: "{{ .Values.kerberos.ccacheMountPath }}/{{ .Values.kerberos.ccacheFileName }}"
celery_kubernetes_executor:
kubernetes_queue: 'kubernetes'
kubernetes_queue: "kubernetes"
kubernetes:
namespace: '{{ .Release.Namespace }}'
namespace: "{{ .Release.Namespace }}"
airflow_configmap: '{{ include "airflow_config" . }}'
airflow_local_settings_configmap: '{{ include "airflow_config" . }}'
pod_template_file: '{{ include "airflow_pod_template_file" . }}/pod_template_file.yaml'
worker_container_repository: '{{ .Values.images.airflow.repository | default .Values.defaultAirflowRepository }}'
worker_container_tag: '{{ .Values.images.airflow.tag | default .Values.defaultAirflowTag }}'
multi_namespace_mode: '{{ if .Values.multiNamespaceMode }}True{{ else }}False{{ end }}'
worker_container_repository: "{{ .Values.images.airflow.repository | default .Values.defaultAirflowRepository }}"
worker_container_tag: "{{ .Values.images.airflow.tag | default .Values.defaultAirflowTag }}"
multi_namespace_mode: "{{ if .Values.multiNamespaceMode }}True{{ else }}False{{ end }}"
# yamllint enable rule:line-length

# Whether Airflow can launch workers and/or pods in multiple namespaces
Expand Down