Skip to content
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.

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

Remove inapplicable configuration section [ldap] (since 2.0.0) #12386

Merged
merged 2 commits into from
Nov 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 0 additions & 78 deletions airflow/config_templates/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1747,84 +1747,6 @@
type: string
example: ~
default: "False"
- name: ldap
description: ~
options:
- name: uri
description: |
set this to ldaps://<your.ldap.server>:<port>
version_added: ~
type: string
example: ~
default: ""
- name: user_filter
description: ~
version_added: ~
type: string
example: ~
default: "objectClass=*"
- name: user_name_attr
description: ~
version_added: ~
type: string
example: ~
default: "uid"
- name: group_member_attr
description: ~
version_added: ~
type: string
example: ~
default: "memberOf"
- name: superuser_filter
description: ~
version_added: ~
type: string
example: ~
default: ""
- name: data_profiler_filter
description: ~
version_added: ~
type: string
example: ~
default: ""
- name: bind_user
description: ~
version_added: ~
type: string
example: ~
default: "cn=Manager,dc=example,dc=com"
- name: bind_password
description: ~
version_added: ~
type: string
example: ~
default: "insecure"
- name: basedn
description: ~
version_added: ~
type: string
example: ~
default: "dc=example,dc=com"
- name: cacert
description: ~
version_added: ~
type: string
example: ~
default: "/etc/ca/ldap_ca.crt"
- name: search_scope
description: ~
version_added: ~
type: string
example: ~
default: "LEVEL"
- name: ignore_malformed_schema
description: |
This setting allows the use of LDAP servers that either return a
broken schema, or do not return a schema.
version_added: 1.10.3
type: string
example: ~
default: "False"
- name: kerberos
description: ~
options:
Expand Down
18 changes: 0 additions & 18 deletions airflow/config_templates/default_airflow.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -873,24 +873,6 @@ use_job_schedule = True
# Only has effect if schedule_interval is set to None in DAG
allow_trigger_in_future = False

[ldap]
# set this to ldaps://<your.ldap.server>:<port>
uri =
user_filter = objectClass=*
user_name_attr = uid
group_member_attr = memberOf
superuser_filter =
data_profiler_filter =
bind_user = cn=Manager,dc=example,dc=com
bind_password = insecure
basedn = dc=example,dc=com
cacert = /etc/ca/ldap_ca.crt
search_scope = LEVEL

# This setting allows the use of LDAP servers that either return a
# broken schema, or do not return a schema.
ignore_malformed_schema = False

[kerberos]
ccache = /tmp/airflow_krb5_ccache

Expand Down
1 change: 0 additions & 1 deletion airflow/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ class AirflowConfigParser(ConfigParser): # pylint: disable=too-many-ancestors
('celery', 'result_backend'),
('atlas', 'password'),
('smtp', 'smtp_password'),
('ldap', 'bind_password'),
('kubernetes', 'git_password'),
}

Expand Down
1 change: 0 additions & 1 deletion docs/howto/set-config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ The following config options support this ``_cmd`` and ``_secret`` version:
* ``result_backend`` in ``[celery]`` section
* ``password`` in ``[atlas]`` section
* ``smtp_password`` in ``[smtp]`` section
* ``bind_password`` in ``[ldap]`` section
* ``git_password`` in ``[kubernetes]`` section

The ``_cmd`` config options can also be set using a corresponding environment variable
Expand Down
1 change: 0 additions & 1 deletion docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ backticks
balancer
balancers
baseOperator
basedn
basestring
basetaskrunner
bashrc
Expand Down
1 change: 0 additions & 1 deletion tests/core/test_config_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
'celery_broker_transport_options',
'dask',
'scheduler',
'ldap',
'kerberos',
'github_enterprise',
'admin',
Expand Down