From 6f381aeea02f21347e42313bf1eef0f3aa642f3c Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Thu, 10 Dec 2020 19:01:52 +0000
Subject: [PATCH] feat(airflow2.0): use 2.0.0rc1 release

---
 airflow/defaults.yaml                   | 26 ++++---------------------
 airflow/files/default/airflow.cfg.jinja |  2 +-
 pillar.example                          |  2 +-
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/airflow/defaults.yaml b/airflow/defaults.yaml
index 9b20d1d..2c2531e 100644
--- a/airflow/defaults.yaml
+++ b/airflow/defaults.yaml
@@ -1,27 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-postgres:
-  users:
-    airflow:
-      ensure: present
-      password: airflow
-      createdb: true
-      inherit: true
-      createroles: true
-      replication: true
-  databases:
-    airflow:
-      owner: airflow
-  acls:
-    - ['local', 'airflow', 'airflow', 'md5']
-    - ['local', 'all', 'all', 'peer']
-    - ['host', 'all', 'all', '127.0.0.1/32', 'md5']
-    - ['host', 'all', 'all', '::1/128', 'md5']
-    - ['local', 'replication', 'all', 'peer']
-    - ['host', 'replication', 'all', '127.0.0.1/32', 'md5']
-    - ['host', 'replication', 'all', '::1/128', 'md5']
-
 airflow:
   security:
     airflow:
@@ -44,6 +23,7 @@ airflow:
           load_examples: False
         webserver:
           authenticate: true
+          secret_key: {{ range(1,200000) | random }}
           auth_backend: airflow.contrib.auth.backends.password_auth  # airflow.api.auth.backend.deny_all
         celery:
           # https://docs.celeryproject.org/en/v5.0.2/getting-started/brokers
@@ -70,7 +50,7 @@ airflow:
         - airflow-worker
   pkg:
     airflow:
-      version: 1.10.13
+      version: 2.0.0rc1  # 1.10.14
       use_upstream: pip
       name: apache-airflow
       commands:
@@ -104,6 +84,8 @@ airflow:
         - attrs
         - cached_property
         - cattrs==1.0.0
+        - pwinrm
+        - apache-airflow-backport-providers-microsoft-winrm
 
         # https://github.com/mher/flower/issues/1029
         # https://docs.celeryproject.org/en/v5.0.2/getting-started/brokers
diff --git a/airflow/files/default/airflow.cfg.jinja b/airflow/files/default/airflow.cfg.jinja
index 6c5457c..3882cf0 100644
--- a/airflow/files/default/airflow.cfg.jinja
+++ b/airflow/files/default/airflow.cfg.jinja
@@ -343,7 +343,7 @@ reload_on_plugin_change = False
 
 # Secret key used to run your flask app
 # It should be as random as possible
-secret_key = temporary_key
+secret_key = {{ config.webserver.secret_key or 'temporary_key' }}
 
 # Number of workers to run the Gunicorn web server
 workers = 4
diff --git a/pillar.example b/pillar.example
index c5220a9..d0bade8 100644
--- a/pillar.example
+++ b/pillar.example
@@ -55,7 +55,7 @@ airflow:
         - airflow-worker
   pkg:
     airflow:
-      version: 1.10.13
+      version: 2.0.0rc1  # 1.10.14
       use_upstream: pip
       extras:
         # https://airflow.apache.org/docs/apache-airflow/stable/installation.html#extra-packages