feat: upgrade to maple

setup.py

@@ -39,7 +39,7 @@ setup(
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.5",
-    install_requires=["tutor>=12.0.0,<13.0.0"],
+    install_requires=["tutor>=13.0.0,<14.0.0"],
     entry_points={"tutor.plugin.v0": ["cairn = tutorcairn.plugin"]},
     classifiers=[
         "Development Status :: 3 - Alpha",

tutorcairn/__about__.py

@@ -1 +1,2 @@
-__version__ = "12.0.13"
+__version__ = "13.0.0"
+

tutorcairn/patches/caddyfile

@@ -1,4 +1,4 @@
 # Cairn
-{{ CAIRN_HOST }}{% if not ENABLE_HTTPS %}:80{% endif %} {
-    reverse_proxy nginx:80
-}
+{{ CAIRN_HOST }}{$default_site_port} {
+    reverse_proxy cairn-superset:8000
+}

tutorcairn/patches/k8s-deployments

@@ -66,7 +66,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
         - name: cairn-vector
-          image: docker.io/timberio/vector:0.13.X-alpine
+          image: docker.io/timberio/vector:0.17.3-alpine
           env:
             - name: VECTOR_SELF_NODE_NAME
               valueFrom:

tutorcairn/patches/local-docker-compose-services

@@ -2,7 +2,7 @@
 
 # log collection
 cairn-vector:
-    image: docker.io/timberio/vector:0.13.X-alpine
+    image: docker.io/timberio/vector:0.17.3-alpine
     volumes:
         - ../../data/cairn/vector:/var/lib/vector
         - ../plugins/cairn/apps/vector/local.toml:/etc/vector/vector.toml:ro

tutorcairn/patches/nginx-extra

@@ -1,19 +0,0 @@
-# Cairn
-upstream cairn-backend {
-    server cairn-superset:8000 fail_timeout=0;
-}
-server {
-  listen 80;
-  server_name {{ CAIRN_HOST }};
-
-  # Disables server version feedback on pages and in headers
-  server_tokens off;
-
-  client_max_body_size 10m;
-
-  location / {
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-    proxy_pass http://cairn-backend;
-  }
-}

tutorcairn/templates/cairn/build/cairn-clickhouse/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/yandex/clickhouse-server:21.2.7.11
+FROM docker.io/yandex/clickhouse-server:21.11.3.6
 
 RUN apt update && apt install -y python3
 COPY ./scripts /scripts

tutorcairn/templates/cairn/build/cairn-superset/Dockerfile

@@ -1,13 +1,16 @@
 # Superset image with additional database drivers
 # https://hub.docker.com/r/apache/superset
 # https://superset.apache.org/docs/databases/installing-database-drivers
-FROM docker.io/apache/superset:0e07a5ca03cb2a6f560b77847c13413b9a8c7d97
+FROM docker.io/apache/superset:c829614c42a620dba7ce1d622fe8f52b6b56f492
 
 USER root
 # https://pypi.org/project/clickhouse-driver/
 # https://pypi.org/project/clickhouse-sqlalchemy/
 # https://pypi.org/project/mysqlclient/
-RUN pip install clickhouse-driver==0.2.0 clickhouse-sqlalchemy==0.1.6 mysqlclient==2.0.3
+RUN pip install clickhouse-driver==0.2.2 mysqlclient==2.0.3
+RUN pip install clickhouse-sqlalchemy==0.1.6
+# Install from master to resolve issue: https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/151
+# RUN pip install -I git+https://github.com/xzkostyan/clickhouse-sqlalchemy@master#egg=clickhouse-sqlalchemy
 
 COPY ./scripts /scripts
 RUN chmod a+x /scripts/*