Superset new version 2.1.1, 3.0.0

CHANGELOG.md

@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - nifi: added support for version 1.23.2 ([#473]).
 - opa: add version 0.57.0 ([#471]).
 - opa: add new version upload script ([#471]).
+- superset: add new version 2.1.1, 3.0.0 ([#482]).
 - zookeeper: add version 3.8.3 ([#470]).
 - zookeeper: add upload script ([#470]).
 
@@ -37,6 +38,8 @@ All notable changes to this project will be documented in this file.
 - airflow: Added wrapper script to allow the triggering of pre/post hook actions ([#435]).
 - hadoop: bumped jmx-exporter version to 0.20.0 ([#478]).
 - hive: bump jmx-exporter to 0.20.0 ([#472]).
+- superset: removed patches that are obsolete since 2.0.0 ([#482]).
+- superset: bump statsd_exporter to 0.24.0 and set via conf.py ([#482]).
 - zookeeper: bumped jmx-exporter version to 0.20.0 ([#470]).
 
 ### Removed
@@ -52,6 +55,7 @@ All notable changes to this project will be documented in this file.
 - nifi: removed support for version 1.15.x, 1.16.x, 1.18.x, 1.20.x ([#473]).
 - nifi: removed openssl from image ([#473]).
 - opa: removed versions 0.27.1, 0.28.0, 0.37.2, 0.41.0, 0.45.0 ([#471]).
+- superset: removed versions 1.3.2, 1.4.1, 1.4.2, 1.5.1, 1.5.3, 2.0.1 ([#482]).
 - zookeeper: removed versions 3.5.8, 3.6.3, 3.7.0, 3.8.0 ([#470]).
 
 [#400]: https://github.com/stackabletech/docker-images/pull/400
@@ -76,6 +80,7 @@ All notable changes to this project will be documented in this file.
 [#476]: https://github.com/stackabletech/docker-images/pull/476
 [#478]: https://github.com/stackabletech/docker-images/pull/478
 [#479]: https://github.com/stackabletech/docker-images/pull/479
+[#482]: https://github.com/stackabletech/docker-images/pull/482
 
 ## [23.7.0] - 2023-07-14
 

conf.py

@@ -304,41 +304,25 @@
         "name": "superset",
         "versions": [
             {
-                "product": "1.3.2",
-                "python": "3.8",
-                "vector": "0.33.0",
-            },
-            {
-                "product": "1.4.1",
+                "product": "2.1.0",
                 "python": "3.9",
                 "vector": "0.33.0",
+                "statsd_exporter": "v0.24.0",
+                "authlib": "0.15.4"  # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.0/requirements-extra.txt#L10
             },
             {
-                "product": "1.4.2",
+                "product": "2.1.1",
                 "python": "3.9",
                 "vector": "0.33.0",
+                "statsd_exporter": "v0.24.0",
+                "authlib": "0.15.4"  # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.0/requirements-extra.txt#L10
             },
             {
-                "product": "1.5.1",
-                "python": "3.8",
-                "vector": "0.33.0",
-            },
-            {
-                "product": "1.5.3",
-                "python": "3.8",
+                "product": "3.0.0",
+                "python": "3.9",
                 "vector": "0.33.0",
-            },
-            {
-                'product': '2.0.1',
-                'python': '3.9',
-                'vector': '0.33.0',
-                'authlib': '0.15.4'  # https://github.com/dpgaspar/Flask-AppBuilder/blob/4ac9bba008e404b9a1e783cd272c81bb8634de3d/requirements-extra.txt#L10
-            },
-            {
-                'product': '2.1.0',
-                'python': '3.9',
-                'vector': '0.33.0',
-                'authlib': '0.15.4'  # https://github.com/dpgaspar/Flask-AppBuilder/blob/4554c40e2298d11c4472ca64b9a60236b12c6535/requirements-extra.txt#L10
+                "statsd_exporter": "v0.24.0",
+                "authlib": "0.15.4"  # https://github.com/dpgaspar/Flask-AppBuilder/blob/v4.3.6/requirements-extra.txt#L7
             },
         ],
     },

superset/Dockerfile

@@ -1,5 +1,9 @@
 # syntax=docker/dockerfile:1
 
+# Get statsd-exporter
+ARG STATSD_EXPORTER
+FROM oci.stackable.tech/mirror/prom/statsd-exporter:${STATSD_EXPORTER} as statsd-exporter
+
 # Build stage
 FROM stackable/image/vector AS builder
 
@@ -48,24 +52,6 @@ RUN microdnf update \
         python-json-logger \
     && if [ ! -z "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi
 
-# Patch Python packages
-
-# In Flask-AppBuilder v4.1.1, a bug in the LDAP integration was fixed (see
-# https://github.com/dpgaspar/Flask-AppBuilder/pull/1846). Superset 2.0.0 and
-# higher depend on a Flask-AppBuilder version containing this fix. Prior
-# Superset versions must be patched.
-
-COPY superset/patches-${PRODUCT}/* /tmp/patches/
-
-# https://github.com/hadolint/hadolint/wiki/DL4006
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN cat /tmp/patches/* | patch \
-    --directory=/stackable/app/lib/python${PYTHON}/site-packages \
-    --strip=1
-
-# Get statsd-exporter
-FROM prom/statsd-exporter:0.3.0@sha256:a9c27602d6f6b86527657922b6a87c12789f7f9b39a90f1513e8c665c941f26a as statsd-exporter
-
 # Final image
 FROM stackable/image/vector
 

superset/README.md

@@ -4,4 +4,4 @@
 
 The `constraints-<version>.txt` files come from e.g. <https://github.com/apache/superset/blob/2.0.1/requirements/base.txt> and are concatenated with the dependencies provided in <https://github.com/apache/superset/blob/2.0.1/requirements/docker.txt>. This differs from version to version (2.0.1 shown here).
 
-In some cases `apispec[yaml]==3.3.2` needed to be adjusted to `apispec==3.3.2`
+In some cases `apispec[yaml]==3.3.2` needed to be adjusted to `apispec==3.3.2` due to `ERROR: Constraints cannot have extras`.