[airflow] branch v1-10-test updated: fixup! Kubernetes Cluster is started on host not in the container (#8265)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk 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 782d916  fixup! Kubernetes Cluster is started on host not in the container (#8265)
782d916 is described below

commit 782d916e0b86eff5fad48a78bf8f4c912b7570e3
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Tue Jun 9 20:52:30 2020 +0200

    fixup! Kubernetes Cluster is started on host not in the container (#8265)
---
 airflow/www_rbac/views.py                                | 3 ++-
 docs/conf.py                                             | 1 -
 scripts/ci/kubernetes/docker/airflow-test-env-init-db.sh | 2 +-
 scripts/ci/kubernetes/docker/bootstrap.sh                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airflow/www_rbac/views.py b/airflow/www_rbac/views.py
index 453cf83..ef2b751 100644
--- a/airflow/www_rbac/views.py
+++ b/airflow/www_rbac/views.py
@@ -53,6 +53,8 @@ from sqlalchemy import and_, desc, func, or_, union_all
 from sqlalchemy.orm import joinedload
 from wtforms import SelectField, validators
 
+import nvd3
+
 import airflow
 from airflow import models, jobs
 from airflow import settings, configuration
@@ -69,7 +71,6 @@ from airflow.utils.dates import infer_time_unit, scale_time_units
 from airflow.utils.db import provide_session, create_session
 from airflow.utils.helpers import alchemy_to_dict, render_log_filename
 from airflow.utils.state import State
-from airflow._vendor import nvd3
 from airflow.www_rbac import utils as wwwutils
 from airflow.www_rbac.app import app, appbuilder
 from airflow.www_rbac.decorators import action_logging, gzipped, has_dag_access
diff --git a/docs/conf.py b/docs/conf.py
index b32a30a..67010b3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -185,7 +185,6 @@ release = airflow.__version__
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = [
-    '_api/airflow/_vendor',
     '_api/airflow/api',
     '_api/airflow/bin',
     '_api/airflow/config_templates',
diff --git a/scripts/ci/kubernetes/docker/airflow-test-env-init-db.sh b/scripts/ci/kubernetes/docker/airflow-test-env-init-db.sh
index c790160..70c710e 100755
--- a/scripts/ci/kubernetes/docker/airflow-test-env-init-db.sh
+++ b/scripts/ci/kubernetes/docker/airflow-test-env-init-db.sh
@@ -26,7 +26,7 @@ echo
 # Init and upgrade the database to latest heads
 cd "${AIRFLOW_SOURCES}"/airflow || exit 1
 
-airflow db init
+airflow initdb
 alembic upgrade heads
 
 echo
diff --git a/scripts/ci/kubernetes/docker/bootstrap.sh b/scripts/ci/kubernetes/docker/bootstrap.sh
index 9099b6b..7f9ca10 100755
--- a/scripts/ci/kubernetes/docker/bootstrap.sh
+++ b/scripts/ci/kubernetes/docker/bootstrap.sh
@@ -28,7 +28,7 @@ echo
 echo "Save minimised web files"
 echo
 
-mv "$(python -m site | grep ^USER_SITE | awk '{print $2}' | tr -d "'")/airflow/www/static/dist/" \
+mv "$(python -m site | grep ^USER_SITE | awk '{print $2}' | tr -d "'")/airflow/www_rbac/static/dist/" \
     "/tmp"
 
 echo