You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/11/03 13:47:09 UTC
[airflow] branch v1-10-test updated: Revert "Adds --no-rbac-ui flag
for Breeze airflow 1.10 installation (#11315)"
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v1-10-test by this push:
new 470f242 Revert "Adds --no-rbac-ui flag for Breeze airflow 1.10 installation (#11315)"
470f242 is described below
commit 470f2424cdee8ee9766460828ffca6152829a1c1
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Tue Nov 3 13:45:43 2020 +0000
Revert "Adds --no-rbac-ui flag for Breeze airflow 1.10 installation (#11315)"
This reverts commit 722b1a480a3024f6f2063e260579a94ba5a22cac.
---
breeze | 3 ++-
breeze-complete | 1 -
scripts/ci/docker-compose/base.yml | 2 +-
scripts/ci/libraries/_initialization.sh | 7 -------
scripts/in_container/entrypoint_ci.sh | 11 -----------
5 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/breeze b/breeze
index fc74cac..522378f 100755
--- a/breeze
+++ b/breeze
@@ -63,6 +63,7 @@ export EXTRA_STATIC_CHECK_OPTIONS
# FORWARD_CREDENTIALS
# DB_RESET
# START_AIRFLOW
+# RBAC_UI
# INSTALL_AIRFLOW_VERSION
# INSTALL_AIRFLOW_REFERENCE
# FORCE_BUILD_IMAGES
@@ -120,7 +121,7 @@ function breeze::setup_default_breeze_constants() {
# If set to true, the test connections will be created
export LOAD_DEFAULT_CONNECTIONS="false"
- # If set to true, the sample dags will be used
+ # If set to true, the sample dags will be created
export LOAD_EXAMPLES="false"
# If set to true, RBAC mode is enabled
diff --git a/breeze-complete b/breeze-complete
index 6a62eaf..95675b4 100644
--- a/breeze-complete
+++ b/breeze-complete
@@ -141,7 +141,6 @@ additional-extras: additional-python-deps:
dev-apt-deps: additional-dev-apt-deps: dev-apt-command: additional-dev-apt-command: additional-dev-apt-env:
runtime-apt-deps: additional-runtime-apt-deps: runtime-apt-command: additional-runtime-apt-command: additional-runtime-apt-env:
load-default-connections load-example-dags
-no-rbac-ui
"
_breeze_commands="
diff --git a/scripts/ci/docker-compose/base.yml b/scripts/ci/docker-compose/base.yml
index a0e7728..706d90c 100644
--- a/scripts/ci/docker-compose/base.yml
+++ b/scripts/ci/docker-compose/base.yml
@@ -52,7 +52,7 @@ services:
- START_AIRFLOW
- LOAD_EXAMPLES
- LOAD_DEFAULT_CONNECTIONS
- - DISABLE_RBAC
+ - RBAC_UI
- ENABLED_SYSTEMS
- RUN_SYSTEM_TESTS
- PYTHON_MAJOR_MINOR_VERSION
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 91c45dd..4831f34 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -111,15 +111,9 @@ function initialization::initialize_base_variables() {
# If set to true, the database will be initialized, a user created and webserver and scheduler started
export START_AIRFLOW=${START_AIRFLOW:="false"}
- # If set to true, the sample dags will be used
export LOAD_EXAMPLES=${LOAD_EXAMPLES:="false"}
- # If set to true, the test connections will be created
export LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS:="false"}
-
- # If set to true, RBAC UI will not be used for 1.10 version
- export DISABLE_RBAC=${DISABLE_RBAC:="false"}
-
# If set the specified file will be used to initialized Airflow after the environment is created,
# otherwise it will use files/airflow-breeze-config/init.sh
export INIT_SCRIPT_FILE=${INIT_SCRIPT_FILE:=""}
@@ -557,7 +551,6 @@ Initialization variables:
INIT_SCRIPT_FILE: ${INIT_SCRIPT_FILE}
LOAD_DEFAULT_CONNECTIONS: ${LOAD_DEFAULT_CONNECTIONS}
LOAD_EXAMPLES: ${LOAD_EXAMPLES}
- DISABLE_RBAC: ${DISABLE_RBAC}
EOF
diff --git a/scripts/in_container/entrypoint_ci.sh b/scripts/in_container/entrypoint_ci.sh
index 7a24875..e74fe40 100755
--- a/scripts/in_container/entrypoint_ci.sh
+++ b/scripts/in_container/entrypoint_ci.sh
@@ -19,15 +19,6 @@ if [[ ${VERBOSE_COMMANDS:="false"} == "true" ]]; then
set -x
fi
-function disable_rbac_if_requested() {
- if [[ ${DISABLE_RBAC:="false"} == "true" ]]; then
- export AIRFLOW__WEBSERVER__RBAC="False"
- else
- export AIRFLOW__WEBSERVER__RBAC="True"
- fi
-}
-
-
# shellcheck source=scripts/in_container/_in_container_script_init.sh
. /opt/airflow/scripts/in_container/_in_container_script_init.sh
@@ -109,8 +100,6 @@ unset AIRFLOW__CORE__UNIT_TEST_MODE
mkdir -pv "${AIRFLOW_HOME}/logs/"
cp -f "${IN_CONTAINER_DIR}/airflow_ci.cfg" "${AIRFLOW_HOME}/unittests.cfg"
-disable_rbac_if_requested
-
set +e
"${IN_CONTAINER_DIR}/check_environment.sh"
ENVIRONMENT_EXIT_CODE=$?