From 80210df387edc280aea652c204780b7d15fd856e Mon Sep 17 00:00:00 2001 From: Anthony Lin Date: Fri, 23 Feb 2018 06:27:57 +0000 Subject: [PATCH] Remove airflow config template This patch set removes the (pre)generated config ini file from airflow. The configuration will now be pulled directly from values.yaml which will be inline with OpenStack-Helm's approach. This will do away with the need to maintain the verbose .conf.tpl in the repository as mentioned by Tin in his comments for [0]. [0] https://review.gerrithub.io/#/c/400925/ Change-Id: I5a9766e52536ac9b143b397faa3563e69dfb6bf3 --- .../templates/configmap-airflow-etc.yaml | 14 +- .../templates/deployment-airflow-flower.yaml | 2 +- .../deployment-airflow-scheduler.yaml | 2 +- .../templates/deployment-airflow-web.yaml | 2 +- .../shipyard/templates/etc/_airflow.cfg.tpl | 482 ------------------ .../templates/statefulset-airflow-worker.yaml | 2 +- charts/shipyard/values.yaml | 8 +- 7 files changed, 8 insertions(+), 504 deletions(-) delete mode 100644 charts/shipyard/templates/etc/_airflow.cfg.tpl diff --git a/charts/shipyard/templates/configmap-airflow-etc.yaml b/charts/shipyard/templates/configmap-airflow-etc.yaml index f15377f3..28c07b0f 100644 --- a/charts/shipyard/templates/configmap-airflow-etc.yaml +++ b/charts/shipyard/templates/configmap-airflow-etc.yaml @@ -14,8 +14,6 @@ {{- $envAll := . }} -{{ include "airflow.conf.airflow_values_skeleton" .Values.conf.airflow | trunc 0 }} - # Add endpoint URI lookup for Airflow Web Server {{- if empty .Values.conf.airflow.webserver.base_url -}} {{- tuple "airflow_web" "internal" "airflow_web" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.airflow.webserver "base_url" | quote | trunc 0 -}} @@ -50,14 +48,4 @@ metadata: name: airflow-etc data: airflow.cfg: |+ -{{ if .Values.conf.airflow.override -}} -{{ .Values.conf.airflow.override | indent 4 }} -{{- else -}} -{{- if .Values.conf.airflow.prefix -}} -{{ .Values.conf.airflow.prefix | indent 4 }} -{{- end }} -{{ tuple "etc/_airflow.cfg.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} -{{- end }} -{{- if .Values.conf.airflow.append -}} -{{ .Values.conf.airflow.append | indent 4 }} -{{- end }} +{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.airflow | indent 4 }} diff --git a/charts/shipyard/templates/deployment-airflow-flower.yaml b/charts/shipyard/templates/deployment-airflow-flower.yaml index 9a983ee7..80d1ab6c 100644 --- a/charts/shipyard/templates/deployment-airflow-flower.yaml +++ b/charts/shipyard/templates/deployment-airflow-flower.yaml @@ -59,7 +59,7 @@ spec: port: {{ .Values.network.airflow.flower.port }} volumeMounts: - name: airflow-etc - mountPath: {{ .Values.conf.airflow.airflow_config_file }} + mountPath: {{ .Values.conf.airflow_config_file.path }} subPath: airflow.cfg readOnly: true {{ if $mounts_airflow_flower.volumeMounts }}{{ toYaml $mounts_airflow_flower.volumeMounts | indent 12 }}{{ end }} diff --git a/charts/shipyard/templates/deployment-airflow-scheduler.yaml b/charts/shipyard/templates/deployment-airflow-scheduler.yaml index 921d3fcb..68f9c380 100644 --- a/charts/shipyard/templates/deployment-airflow-scheduler.yaml +++ b/charts/shipyard/templates/deployment-airflow-scheduler.yaml @@ -74,7 +74,7 @@ spec: args: ["scheduler", "-n", "-1" ] volumeMounts: - name: airflow-etc - mountPath: {{ .Values.conf.airflow.airflow_config_file }} + mountPath: {{ .Values.conf.airflow_config_file.path }} subPath: airflow.cfg readOnly: true {{- if .Values.prod_environment }} diff --git a/charts/shipyard/templates/deployment-airflow-web.yaml b/charts/shipyard/templates/deployment-airflow-web.yaml index e6586dbe..e7b7795c 100644 --- a/charts/shipyard/templates/deployment-airflow-web.yaml +++ b/charts/shipyard/templates/deployment-airflow-web.yaml @@ -78,7 +78,7 @@ spec: port: {{ .Values.network.airflow.web.port }} volumeMounts: - name: airflow-etc - mountPath: {{ .Values.conf.airflow.airflow_config_file }} + mountPath: {{ .Values.conf.airflow_config_file.path }} subPath: airflow.cfg readOnly: true {{- if .Values.prod_environment }} diff --git a/charts/shipyard/templates/etc/_airflow.cfg.tpl b/charts/shipyard/templates/etc/_airflow.cfg.tpl deleted file mode 100644 index ff0c3ce5..00000000 --- a/charts/shipyard/templates/etc/_airflow.cfg.tpl +++ /dev/null @@ -1,482 +0,0 @@ -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -{{ include "airflow.conf.airflow_values_skeleton" .Values.conf.airflow | trunc 0 }} -{{ include "airflow.conf.airflow" .Values.conf.airflow}} - -{{- define "airflow.conf.airflow_values_skeleton" -}} - -{{- if not .core -}}{{- set . "core" dict -}}{{- end -}} -{{- if not .cli -}}{{- set . "cli" dict -}}{{- end -}} -{{- if not .api -}}{{- set . "api" dict -}}{{- end -}} -{{- if not .operators -}}{{- set . "operators" dict -}}{{- end -}} -{{- if not .webserver -}}{{- set . "webserver" dict -}}{{- end -}} -{{- if not .email -}}{{- set . "email" dict -}}{{- end -}} -{{- if not .smtp -}}{{- set . "smtp" dict -}}{{- end -}} -{{- if not .celery -}}{{- set . "celery" dict -}}{{- end -}} -{{- if not .celery_broker_transport_options -}}{{- set . "celery_broker_transport_options" dict -}}{{- end -}} -{{- if not .scheduler -}}{{- set . "scheduler" dict -}}{{- end -}} -{{- if not .ldap -}}{{- set . "ldap" dict -}}{{- end -}} -{{- if not .admin -}}{{- set . "admin" dict -}}{{- end -}} - -{{- end -}} - -{{- define "airflow.conf.airflow" -}} - -[core] -# The home folder for airflow, default is ~/airflow -{{ if not .core.airflow_home }}#{{ end }}airflow_home = {{ .core.airflow_home | default "" }} - -# The folder where your airflow pipelines live, most likely a -# subfolder in a code repository -# This path must be absolute -{{ if not .core.dags_folder }}#{{ end }}dags_folder = {{ .core.dags_folder | default "" }} - -# The folder where airflow should store its log files -# This path must be absolute -{{ if not .core.base_log_folder }}#{{ end }}base_log_folder = {{ .core.base_log_folder | default "" }} - -# Airflow can store logs remotely in AWS S3 or Google Cloud Storage. Users -# must supply an Airflow connection id that provides access to the storage -# location. If remote_logging is set to true, see UPDATING.md for additional -# configuration requirements. -{{ if not .core.remote_logging }}#{{ end }}remote_logging = {{ .core.remote_logging | default "" }} -{{ if not .core.remote_log_conn_id }}#{{ end }}remote_log_conn_id = {{ .core.remote_log_conn_id | default "" }} -{{ if not .core.encrypt_s3_logs }}#{{ end }}encrypt_s3_logs = {{ .core.encrypt_s3_logs | default "" }} - -# Logging level -{{ if not .core.logging_level }}#{{ end }}logging_level = {{ .core.logging_level | default "" }} - -# Logging class -# Specify the class that will specify the logging configuration -# This class has to be on the python classpath -{{ if not .core.logging_config_class }}#{{ end }}logging_config_class = {{ .core.logging_config_class | default "" }} - -# Log format -{{ if not .core.log_format }}#{{ end }}log_format = {{ .core.log_format | default "" }} -{{ if not .core.simple_log_format }}#{{ end }}simple_log_format = {{ .core.simple_log_format | default "" }} - -# Default timezone in case supplied date times are naive -# can be utc (default), system, or any IANA timezone string (e.g. Europe/Amsterdam) -{{ if not .core.default_timezone }}#{{ end }}default_timezone = {{ .core.default_timezone | default "" }} - -# The executor class that airflow should use. Choices include -# SequentialExecutor, LocalExecutor, CeleryExecutor, DaskExecutor -{{ if not .core.executor }}#{{ end }}executor = {{ .core.executor | default "" }} - -# The SqlAlchemy connection string to the metadata database. -# SqlAlchemy supports many different database engine, more information -# their website -{{ if not .core.sql_alchemy_conn }}#{{ end }}sql_alchemy_conn = {{ .core.sql_alchemy_conn | default "" }} - -# If SqlAlchemy should pool database connections. -{{ if not .core.sql_alchemy_pool_enabled }}#{{ end }}sql_alchemy_pool_enabled = {{ .core.sql_alchemy_pool_enabled | default "" }} - -# The SqlAlchemy pool size is the maximum number of database connections -# in the pool. -{{ if not .core.sql_alchemy_pool_size }}#{{ end }}sql_alchemy_pool_size = {{ .core.sql_alchemy_pool_size | default "" }} - -# The SqlAlchemy pool recycle is the number of seconds a connection -# can be idle in the pool before it is invalidated. This config does -# not apply to sqlite. -{{ if not .core.sql_alchemy_pool_recycle }}#{{ end }}sql_alchemy_pool_recycle = {{ .core.sql_alchemy_pool_recycle | default "" }} - -# How many seconds to retry re-establishing a DB connection after -# disconnects. Setting this to 0 disables retries. -{{ if not .core.sql_alchemy_reconnect_timeout }}#{{ end }}sql_alchemy_reconnect_timeout = {{ .core.sql_alchemy_reconnect_timeout | default "" }} - -# The amount of parallelism as a setting to the executor. This defines -# the max number of task instances that should run simultaneously -# on this airflow installation -{{ if not .core.parallelism }}#{{ end }}parallelism = {{ .core.parallelism | default "" }} - -# The number of task instances allowed to run concurrently by the scheduler -{{ if not .core.dag_concurrency }}#{{ end }}dag_concurrency = {{ .core.dag_concurrency | default "" }} - -# Are DAGs paused by default at creation -{{ if not .core.dags_are_paused_at_creation }}#{{ end }}dags_are_paused_at_creation = {{ .core.dags_are_paused_at_creation | default "" }} - -# When not using pools, tasks are run in the "default pool", -# whose size is guided by this config element -{{ if not .core.non_pooled_task_slot_count }}#{{ end }}non_pooled_task_slot_count = {{ .core.non_pooled_task_slot_count | default "" }} - -# The maximum number of active DAG runs per DAG -{{ if not .core.max_active_runs_per_dag }}#{{ end }}max_active_runs_per_dag = {{ .core.max_active_runs_per_dag | default "" }} - -# Whether to load the examples that ship with Airflow. It's good to -# get started, but you probably want to set this to False in a production -# environment -{{ if not .core.load_examples }}#{{ end }}load_examples = {{ .core.load_examples | default "" }} - -# Where your Airflow plugins are stored -{{ if not .core.plugins_folder }}#{{ end }}plugins_folder = {{ .core.plugins_folder | default "" }} - -# Secret key to save connection passwords in the db -{{ if not .core.fernet_key }}#{{ end }}fernet_key = {{ .core.fernet_key | default "" }} - -# Whether to disable pickling dags -{{ if not .core.donot_pickle }}#{{ end }}donot_pickle = {{ .core.donot_pickle | default "" }} - -# How long before timing out a python file import while filling the DagBag -{{ if not .core.dagbag_import_timeout }}#{{ end }}dagbag_import_timeout = {{ .core.dagbag_import_timeout | default "" }} - -# The class to use for running task instances in a subprocess -{{ if not .core.task_runner }}#{{ end }}task_runner = {{ .core.task_runner | default "" }} - -# If set, tasks without a `run_as_user` argument will be run with this user -# Can be used to de-elevate a sudo user running Airflow when executing tasks -{{ if not .core.default_impersonation }}#{{ end }}default_impersonation = {{ .core.default_impersonation | default "" }} - -# What security module to use (for example kerberos): -{{ if not .core.security }}#{{ end }}security = {{ .core.security | default "" }} - -# If set to False enables some unsecure features like Charts and Ad Hoc Queries. -# In 2.0 will default to True. -{{ if not .core.secure_mode }}#{{ end }}secure_mode = {{ .core.secure_mode | default "" }} - -# Turn unit test mode on (overwrites many configuration options with test -# values at runtime) -{{ if not .core.unit_test_mode }}#{{ end }}unit_test_mode = {{ .core.unit_test_mode | default "" }} - -# Name of handler to read task instance logs. -# Default to use task handler. -{{ if not .core.task_log_reader }}#{{ end }}task_log_reader = {{ .core.task_log_reader | default "" }} - -# Whether to enable pickling for xcom (note that this is insecure and allows for -# RCE exploits). This will be deprecated in Airflow 2.0 (be forced to False). -{{ if not .core.enable_xcom_pickling }}#{{ end }}enable_xcom_pickling = {{ .core.enable_xcom_pickling | default "" }} - -# When a task is killed forcefully, this is the amount of time in seconds that -# it has to cleanup after it is sent a SIGTERM, before it is SIGKILLED -{{ if not .core.killed_task_cleanup_time }}#{{ end }}killed_task_cleanup_time = {{ .core.killed_task_cleanup_time | default "" }} - -[cli] -# In what way should the cli access the API. The LocalClient will use the -# database directly, while the json_client will use the api running on the -# webserver -{{ if not .cli.api_client }}#{{ end }}api_client = {{ .cli.api_client | default "" }} - -# If you set web_server_url_prefix, do NOT forget to append it here, ex: -# endpoint_url = http://localhost:8080/myroot -# So api will look like: http://localhost:8080/myroot/api/experimental/... -{{ if not .cli.endpoint_url }}#{{ end }}endpoint_url = {{ .cli.endpoint_url | default "" }} - -[api] -# How to authenticate users of the API -{{ if not .api.auth_backend }}#{{ end }}auth_backend = {{ .api.auth_backend | default "" }} - -[operators] -# The default owner assigned to each new operator, unless -# provided explicitly or passed via `default_args` -{{ if not .operators.default_owner }}#{{ end }}default_owner = {{ .operators.default_owner | default "" }} -{{ if not .operators.default_cpus }}#{{ end }}default_cpus = {{ .operators.default_cpus | default "" }} -{{ if not .operators.default_ram }}#{{ end }}default_ram = {{ .operators.default_ram | default "" }} -{{ if not .operators.default_disk }}#{{ end }}default_disk = {{ .operators.default_disk | default "" }} -{{ if not .operators.default_gpus }}#{{ end }}default_gpus = {{ .operators.default_gpus | default "" }} - -[hive] -# Default mapreduce queue for HiveOperator tasks -# default_hive_mapred_queue = - -[webserver] -# The base url of your website as airflow cannot guess what domain or -# cname you are using. This is use in automated emails that -# airflow sends to point links to the right web server -{{ if not .webserver.base_url }}#{{ end }}base_url = {{ .webserver.base_url | default "" }} - -# The ip specified when starting the web server -{{ if not .webserver.web_server_host }}#{{ end }}web_server_host = {{ .webserver.web_server_host | default "" }} - -# The port on which to run the web server -{{ if not .webserver.web_server_port }}#{{ end }}web_server_port = {{ .webserver.web_server_port | default "" }} - -# Paths to the SSL certificate and key for the web server. When both are -# provided SSL will be enabled. This does not change the web server port. -{{ if not .webserver.web_server_ssl_cert }}#{{ end }}web_server_ssl_cert = {{ .webserver.web_server_ssl_cert | default "" }} -{{ if not .webserver.web_server_ssl_key }}#{{ end }}web_server_ssl_key = {{ .webserver.web_server_ssl_key | default "" }} - -# Number of seconds the gunicorn webserver waits before timing out on a worker -{{ if not .webserver.web_server_worker_timeout }}#{{ end }}web_server_worker_timeout = {{ .webserver.web_server_worker_timeout | default "" }} - -# Number of workers to refresh at a time. When set to 0, worker refresh is -# disabled. When nonzero, airflow periodically refreshes webserver workers by -# bringing up new ones and killing old ones. -{{ if not .webserver.worker_refresh_batch_size }}#{{ end }}worker_refresh_batch_size = {{ .webserver.worker_refresh_batch_size | default "" }} - -# Number of seconds to wait before refreshing a batch of workers. -{{ if not .webserver.worker_refresh_interval }}#{{ end }}worker_refresh_interval = {{ .webserver.worker_refresh_interval | default "" }} - -# Secret key used to run your flask app -{{ if not .webserver.secret_key }}#{{ end }}secret_key = {{ .webserver.secret_key | default "" }} - -# Number of workers to run the Gunicorn web server -{{ if not .webserver.workers }}#{{ end }}workers = {{ .webserver.workers | default "" }} - -# The worker class gunicorn should use. Choices include -# sync (default), eventlet, gevent -{{ if not .webserver.worker_class }}#{{ end }}worker_class = {{ .webserver.worker_class | default "" }} - -# Log files for the gunicorn webserver. '-' means log to stderr. -{{ if not .webserver.access_logfile }}#{{ end }}access_logfile = {{ .webserver.access_logfile | default "" }} -{{ if not .webserver.error_logfile }}#{{ end }}error_logfile = {{ .webserver.error_logfile | default "" }} - -# Expose the configuration file in the web server -{{ if not .webserver.expose_config }}#{{ end }}expose_config = {{ .webserver.expose_config | default "" }} - -# Set to true to turn on authentication : http://pythonhosted.org/airflow/installation.html#web-authentication -{{ if not .webserver.authenticate }}#{{ end }}authenticate = {{ .webserver.authenticate | default "" }} - -# Filter the list of dags by owner name (requires authentication to be enabled) -{{ if not .webserver.filter_by_owner }}#{{ end }}filter_by_owner = {{ .webserver.filter_by_owner | default "" }} - -# Filtering mode. Choices include user ) and ldapgroup. -# Ldap group filtering requires using the ldap backend -# -# Note that the ldap server needs the "memberOf" overlay to be set up -# in order to user the ldapgroup mode. -{{ if not .webserver.owner_mode }}#{{ end }}owner_mode = {{ .webserver.owner_mode | default "" }} - -# Default DAG view. Valid values are: -# tree, graph, duration, gantt, landing_times -{{ if not .webserver.dag_default_view }}#{{ end }}dag_default_view = {{ .webserver.dag_default_view | default "" }} - -# Default DAG orientation. Valid values are: -# LR (Left->Right), TB (Top->Bottom), RL (Right->Left), BT (Bottom->Top) -{{ if not .webserver.dag_orientation }}#{{ end }}dag_orientation = {{ .webserver.dag_orientation | default "" }} - -# Puts the webserver in demonstration mode; blurs the names of Operators for -# privacy. -{{ if not .webserver.demo_mode }}#{{ end }}demo_mode = {{ .webserver.demo_mode | default "" }} - -# The amount of time (in secs) webserver will wait for initial handshake -# while fetching logs from other worker machine -{{ if not .webserver.log_fetch_timeout_sec }}#{{ end }}log_fetch_timeout_sec = {{ .webserver.log_fetch_timeout_sec | default "" }} - -# By default, the webserver shows paused DAGs. Flip this to hide paused -# DAGs by default -{{ if not .webserver.hide_paused_dags_by_default }}#{{ end }}hide_paused_dags_by_default = {{ .webserver.hide_paused_dags_by_default | default "" }} - -# Consistent page size across all listing views in the UI -{{ if not .webserver.page_size }}#{{ end }}page_size = {{ .webserver.page_size | default "" }} - -[email] -{{ if not .email.email_backend }}#{{ end }}email_backend = {{ .email.email_backend | default "" }} - -[smtp] -# If you want airflow to send emails on retries, failure, and you want to -# the airflow.utils.send_email function, you have to configure an smtp -# server here -{{ if not .smtp.smtp_host }}#{{ end }}smtp_host = {{ .smtp.smtp_host | default "" }} -{{ if not .smtp.smtp_starttls }}#{{ end }}smtp_smtp_starttls = {{ .smtp.smtp_starttls | default "" }} -{{ if not .smtp.smtp_ssl }}#{{ end }}smtp_ssl = {{ .smtp.smtp_ssl | default "" }} -# Uncomment and set the user/pass settings if you want to use SMTP AUTH -# {{ if not .smtp.smtp_user }}#{{ end }}smtp_user = {{ .smtp.smtp_user | default "" }} -# {{ if not .smtp.smtp_password }}#{{ end }}smtp_password = {{ .smtp.smtp_password | default "" }} -{{ if not .smtp.smtp_port }}#{{ end }}smtp_port = {{ .smtp.smtp_port | default "" }} -{{ if not .smtp.smtp_mail_from }}#{{ end }}smtp_mail_from = {{ .smtp.smtp_mail_from | default "" }} - -[celery] -# This section only applies if you are using the CeleryExecutor in -# [core] section above - -# The app name that will be used by celery -{{ if not .celery.celery_app_name }}#{{ end }}celery_app_name = {{ .celery.celery_app_name | default "" }} - -# The concurrency that will be used when starting workers with the -# "airflow worker" command. This defines the number of task instances that -# a worker will take, so size up your workers based on the resources on -# your worker box and the nature of your tasks -{{ if not .celery.celeryd_concurrency }}#{{ end }}celeryd_concurrency = {{ .celery.celeryd_concurrency | default "" }} - -# When you start an airflow worker, airflow starts a tiny web server -# subprocess to serve the workers local log files to the airflow main -# web server, who then builds pages and sends them to users. This defines -# the port on which the logs are served. It needs to be unused, and open -# visible from the main web server to connect into the workers. -{{ if not .celery.worker_log_server_port }}#{{ end }}worker_log_server_port = {{ .celery.worker_log_server_port | default "" }} - -# The Celery broker URL. Celery supports RabbitMQ, Redis and experimentally -# a sqlalchemy database. Refer to the Celery documentation for more -# information. -# http://docs.celeryproject.org/en/latest/userguide/configuration.html#broker-settings -{{ if not .celery.broker_url }}#{{ end }}broker_url = {{ .celery.broker_url | default "" }} - -# The Celery result_backend. When a job finishes, it needs to update the -# metadata of the job. Therefore it will post a message on a message bus, -# or insert it into a database (depending of the backend) -# This status is used by the scheduler to update the state of the task -# The use of a database is highly recommended -# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-result-backend-settings -{{ if not .celery.result_backend }}#{{ end }}result_backend = {{ .celery.result_backend | default "" }} -{{ if not .celery.celery_result_backend }}#{{ end }}celery_result_backend = {{ .celery.celery_result_backend | default "" }} - -# Celery Flower is a sweet UI for Celery. Airflow has a shortcut to start -# it `airflow flower`. This defines the IP that Celery Flower runs on -{{ if not .celery.flower_host }}#{{ end }}flower_host = {{ .celery.flower_host | default "" }} - -# The root URL for Flower -# Ex: flower_url_prefix = /flower -{{ if not .celery.flower_url_prefix }}#{{ end }}flower_url_prefix = {{ .celery.flower_url_prefix | default "" }} - -# This defines the port that Celery Flower runs on -{{ if not .celery.flower_port }}#{{ end }}flower_port = {{ .celery.flower_port | default "" }} - -# Default queue that tasks get assigned to and that worker listen on. -{{ if not .celery.default_queue }}#{{ end }}default_queue = {{ .celery.default_queue | default "" }} - -# Import path for celery configuration options -{{ if not .celery.celery_config_options }}#{{ end }}celery_config_options = {{ .celery.celery_config_options | default "" }} - -[celery_broker_transport_options] -# The visibility timeout defines the number of seconds to wait for the worker -# to acknowledge the task before the message is redelivered to another worker. -# Make sure to increase the visibility timeout to match the time of the longest -# ETA you're planning to use. Especially important in case of using Redis or SQS -{{ if not .celery_broker_transport_options.visibility_timeout }}#{{ end }}visibility_timeout = {{ .celery_broker_transport_options.visibility_timeout | default "" }} - -# In case of using SSL -{{ if not .celery_broker_transport_options.ssl_active }}#{{ end }}ssl_active = {{ .celery_broker_transport_options.ssl_active | default "" }} -{{ if not .celery_broker_transport_options.ssl_key }}#{{ end }}ssl_key = {{ .celery_broker_transport_options.ssl_key | default "" }} -{{ if not .celery_broker_transport_options.ssl_cert }}#{{ end }}ssl_cert = {{ .celery_broker_transport_options.ssl_cert | default "" }} -{{ if not .celery_broker_transport_options.ssl_cacert }}#{{ end }}ssl_cacert = {{ .celery_broker_transport_options.ssl_cacert | default "" }} - -[dask] -# This section only applies if you are using the DaskExecutor in -# [core] section above - -# The IP address and port of the Dask cluster's scheduler. -# cluster_address = 127.0.0.1:8786 - -[scheduler] -# Task instances listen for external kill signal (when you clear tasks -# from the CLI or the UI), this defines the frequency at which they should -# listen (in seconds). -{{ if not .scheduler.job_heartbeat_sec }}#{{ end }}job_heartbeat_sec = {{ .scheduler.job_heartbeat_sec | default "" }} - -# The scheduler constantly tries to trigger new tasks (look at the -# scheduler section in the docs for more information). This defines -# how often the scheduler should run (in seconds). -{{ if not .scheduler.scheduler_heartbeat_sec }}#{{ end }}scheduler_heartbeat_sec = {{ .scheduler.scheduler_heartbeat_sec | default "" }} - -# after how much time should the scheduler terminate in seconds -# -1 indicates to run continuously (see also num_runs) -{{ if not .scheduler.run_duration }}#{{ end }}run_duration = {{ .scheduler.run_duration | default "" }} - -# after how much time a new DAGs should be picked up from the filesystem -{{ if not .scheduler.min_file_process_interval }}#{{ end }}min_file_process_interval = {{ .scheduler.min_file_process_interval | default "" }} - -{{ if not .scheduler.dag_dir_list_interval }}#{{ end }}dag_dir_list_interval = {{ .scheduler.dag_dir_list_interval | default "" }} - -# How often should stats be printed to the logs -{{ if not .scheduler.print_stats_interval }}#{{ end }}print_stats_interval = {{ .scheduler.print_stats_interval | default "" }} - -{{ if not .scheduler.child_process_log_directory }}#{{ end }}child_process_log_directory = {{ .scheduler.child_process_log_directory | default "" }} - -# Local task jobs periodically heartbeat to the DB. If the job has -# not heartbeat in this many seconds, the scheduler will mark the -# associated task instance as failed and will re-schedule the task. -{{ if not .scheduler.scheduler_zombie_task_threshold }}#{{ end }}scheduler_zombie_task_threshold = {{ .scheduler.scheduler_zombie_task_threshold | default "" }} - -# Turn off scheduler catchup by setting this to False. -# Default behavior is unchanged and -# Command Line Backfills still work, but the scheduler -# will not do scheduler catchup if this is False, -# however it can be set on a per DAG basis in the -# DAG definition (catchup) -{{ if not .scheduler.catchup_by_default }}#{{ end }}catchup_by_default = {{ .scheduler.catchup_by_default | default "" }} - -# This changes the batch size of queries in the scheduling main loop. -# This depends on query length limits and how long you are willing to hold locks. -# 0 for no limit -{{ if not .scheduler.max_tis_per_query }}#{{ end }}max_tis_per_query = {{ .scheduler.max_tis_per_query | default "" }} - -# Statsd (https://github.com/etsy/statsd) integration settings -# statsd_on = False -# statsd_host = localhost -# statsd_port = 8125 -# statsd_prefix = airflow - -# The scheduler can run multiple threads in parallel to schedule dags. -# This defines how many threads will run. -{{ if not .scheduler.max_threads }}#{{ end }}max_threads = {{ .scheduler.max_threads | default "" }} - -{{ if not .scheduler.authenticate }}#{{ end }}authenticate = {{ .scheduler.authenticate | default "" }} - -[ldap] -# set this to ldaps://: -{{ if not .ldap.uri }}#{{ end }}uri = {{ .ldap.uri | default "" }} -{{ if not .ldap.user_filter }}#{{ end }}user_filter = {{ .ldap.user_filter | default "" }} -{{ if not .ldap.user_name_attr }}#{{ end }}user_name_attr = {{ .ldap.user_name_attr | default "" }} -{{ if not .ldap.group_member_attr }}#{{ end }}group_member_attr = {{ .ldap.group_member_attr | default "" }} -{{ if not .ldap.superuser_filter }}#{{ end }}superuser_filter = {{ .ldap.superuser_filter | default "" }} -{{ if not .ldap.data_profiler_filter }}#{{ end }}data_profiler_filter = {{ .ldap.data_profiler_filter | default "" }} -{{ if not .ldap.bind_user }}#{{ end }}bind_user = {{ .ldap.bind_user | default "" }} -{{ if not .ldap.bind_password }}#{{ end }}bind_password = {{ .ldap.bind_password | default "" }} -{{ if not .ldap.basedn }}#{{ end }}basedn = {{ .ldap.basedn | default "" }} -{{ if not .ldap.cacert }}#{{ end }}cacert = {{ .ldap.cacert | default "" }} -{{ if not .ldap.search_scope }}#{{ end }}search_scope = {{ .ldap.search_scope | default "" }} - -[mesos] -# Mesos master address which MesosExecutor will connect to. -# master = localhost:5050 - -# The framework name which Airflow scheduler will register itself as on mesos -# framework_name = Airflow - -# Number of cpu cores required for running one task instance using -# 'airflow run --local -p ' -# command on a mesos slave -# task_cpu = 1 - -# Memory in MB required for running one task instance using -# 'airflow run --local -p ' -# command on a mesos slave -# task_memory = 256 - -# Enable framework checkpointing for mesos -# See http://mesos.apache.org/documentation/latest/slave-recovery/ -# checkpoint = False - -# Failover timeout in milliseconds. -# When checkpointing is enabled and this option is set, Mesos waits -# until the configured timeout for -# the MesosExecutor framework to re-register after a failover. Mesos -# shuts down running tasks if the -# MesosExecutor framework fails to re-register within this timeframe. -# failover_timeout = 604800 - -# Enable framework authentication for mesos -# See http://mesos.apache.org/documentation/latest/configuration/ -# authenticate = False - -# Mesos credentials, if authentication is enabled -# default_principal = admin -# default_secret = admin - -[kerberos] -# ccache = /tmp/airflow_krb5_ccache -# gets augmented with fqdn -# principal = airflow -# reinit_frequency = 3600 -# kinit_path = kinit -# keytab = airflow.keytab - -[github_enterprise] -# api_rev = v3 - -[admin] -# UI to hide sensitive variable fields when set to True -{{ if not .admin.hide_sensitive_variable_fields }}#{{ end }}hide_sensitive_variable_fields = {{ .admin.hide_sensitive_variable_fields | default "" }} - -{{- end -}} diff --git a/charts/shipyard/templates/statefulset-airflow-worker.yaml b/charts/shipyard/templates/statefulset-airflow-worker.yaml index 8d5abc0a..e9abf094 100644 --- a/charts/shipyard/templates/statefulset-airflow-worker.yaml +++ b/charts/shipyard/templates/statefulset-airflow-worker.yaml @@ -120,7 +120,7 @@ spec: privileged: true volumeMounts: - name: airflow-etc - mountPath: {{ .Values.conf.airflow.airflow_config_file }} + mountPath: {{ .Values.conf.airflow_config_file.path }} subPath: airflow.cfg readOnly: true {{- if .Values.prod_environment }} diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml index ac4a964b..30043dc9 100644 --- a/charts/shipyard/values.yaml +++ b/charts/shipyard/values.yaml @@ -374,11 +374,9 @@ conf: deckhand_client_read_timeout: 300 validation_connect_timeout: 5 validation_read_timeout: 300 + airflow_config_file: + path: /usr/local/airflow/airflow.cfg airflow: - override: - append: - prefix: - airflow_config_file: /usr/local/airflow/airflow.cfg core: airflow_home: /usr/local/airflow dags_folder: /usr/local/airflow/dags @@ -459,7 +457,7 @@ conf: smtp_mail_from: airflow@airflow.local celery: celery_app_name: airflow.executors.celery_executor - celeryd_concurrency: 16 + worker_concurrency: 16 worker_log_server_port: 8793 flower_host: 0.0.0.0 flower_url_prefix: