Skip to content

Commit 3853d7c

Browse files
authored
chore(nifi): Bump demos to use 2.12.0 (#454)
* chore(signal-processing): Update demo image to use nifi 2.12.0 and jdbc postgres 42.7.13 * chore(stack/data-lakehouse-iceberg-trino-spark): Update nifi cluster to 2.12.0 * chore(stack/nifi-kafka-druid-superset-s3): Update nifi cluster to 2.12.0 * chore(demo/signal-processing): Update deps * chore(demo/signal-processing): Upgrade pyspark-notebook image to python-3.11 * chore(demo/signal-processing): Upgrade pyspark-notebook image to python-3.13 * fix(jupyter-pyspark-with-alibi-detect): Drop to Python 3.12 * fix(stacks/signal-processing): Update image version used in demo
1 parent 125d7ce commit 3853d7c

11 files changed

Lines changed: 27 additions & 24 deletions

File tree

‎.github/workflows/dev_jupyter-pyspark-with-alibi-detect.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ jobs:
2929
image-name: jupyter-pyspark-with-alibi-detect
3030
# TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that
3131
# the demo is reproducable for the release and it will be automatically replaced for the release branch.
32-
image-version: python-3.9
32+
image-version: python-3.12
3333
containerfile-path: demos/signal-processing/Dockerfile-jupyter

‎.github/workflows/dev_nifi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ jobs:
3030
image-name: nifi
3131
# TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that
3232
# the demo is reproducable for the release and it will be automatically replaced for the release branch.
33-
image-version: 2.9.0-postgresql
33+
image-version: 2.12.0-postgresql
3434
containerfile-path: demos/signal-processing/Dockerfile-nifi

‎demos/signal-processing/Dockerfile-jupyter‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM jupyter/pyspark-notebook:python-3.9
1+
# Find the latest python version here:
2+
# https://quay.io/repository/jupyter/pyspark-notebook?tab=tags (use the tag search)
3+
# NOTE: This can't run on Python 3.13 until https://github.com/SeldonIO/alibi-detect/issues/963 is resolved
4+
FROM quay.io/jupyter/pyspark-notebook:python-3.12
25

36
COPY demos/signal-processing/requirements.txt .
47

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM oci.stackable.tech/sdp/nifi:2.9.0-stackable0.0.0-dev
1+
FROM oci.stackable.tech/sdp/nifi:2.12.0-stackable0.0.0-dev
22

33
# This is the postgresql JDBC driver from https://jdbc.postgresql.org/download/
44
# There appear to be no signatures to validate against 😬
55
#
6-
# VERSION="42.7.10"
6+
# VERSION="42.7.13"
77
# curl -O "https://jdbc.postgresql.org/download/postgresql-$VERSION.jar"
88
# curl --fail -u "your_username" --upload-file "postgresql-$VERSION.jar" 'https://repo.stackable.tech/repository/misc/jdbc/'
99
# rm "postgresql-$VERSION.jar"
1010

1111
# IMPORTANT (@NickLarsenNZ): Changing this version requires a change in the NiFi template (DownloadAndWriteToDB.json)
12-
ARG DRIVER_VERSION="42.7.10"
12+
ARG DRIVER_VERSION="42.7.13"
1313
RUN curl --fail -o "/stackable/nifi/postgresql-$DRIVER_VERSION.jar" "https://repo.stackable.tech/repository/misc/jdbc/postgresql-$DRIVER_VERSION.jar"

‎demos/signal-processing/DownloadAndWriteToDB.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"bundle": {
2525
"group": "org.apache.nifi",
2626
"artifact": "nifi-standard-nar",
27-
"version": "2.6.0"
27+
"version": "2.12.0"
2828
},
2929
"properties": {
3030
"Proxy Host": null,
@@ -337,7 +337,7 @@
337337
"bundle": {
338338
"group": "org.apache.nifi",
339339
"artifact": "nifi-standard-nar",
340-
"version": "2.6.0"
340+
"version": "2.12.0"
341341
},
342342
"properties": {
343343
"put-db-record-allow-multiple-statements": "false",
@@ -538,7 +538,7 @@
538538
"bundle": {
539539
"group": "org.apache.nifi",
540540
"artifact": "nifi-standard-nar",
541-
"version": "2.6.0"
541+
"version": "2.12.0"
542542
},
543543
"properties": {
544544
"Support Fragmented Transactions": "false",
@@ -729,7 +729,7 @@
729729
"bundle": {
730730
"group": "org.apache.nifi",
731731
"artifact": "nifi-dbcp-service-nar",
732-
"version": "2.6.0"
732+
"version": "2.12.0"
733733
},
734734
"properties": {
735735
"dbcp-min-idle-conns": "0",
@@ -746,7 +746,7 @@
746746
"Database User": "admin",
747747
"kerberos-user-service": null,
748748
"dbcp-soft-min-evictable-idle-time": "-1",
749-
"database-driver-locations": "/stackable/nifi/postgresql-42.7.10.jar",
749+
"database-driver-locations": "/stackable/nifi/postgresql-42.7.13.jar",
750750
"dbcp-max-idle-conns": "8"
751751
},
752752
"propertyDescriptors": {
@@ -873,7 +873,7 @@
873873
"bundle": {
874874
"group": "org.apache.nifi",
875875
"artifact": "nifi-standard-services-api-nar",
876-
"version": "2.6.0"
876+
"version": "2.12.0"
877877
}
878878
}
879879
],
@@ -891,7 +891,7 @@
891891
"bundle": {
892892
"group": "org.apache.nifi",
893893
"artifact": "nifi-record-serialization-services-nar",
894-
"version": "2.6.0"
894+
"version": "2.12.0"
895895
},
896896
"properties": {
897897
"ignore-csv-header": "false",
@@ -1064,7 +1064,7 @@
10641064
"bundle": {
10651065
"group": "org.apache.nifi",
10661066
"artifact": "nifi-standard-services-api-nar",
1067-
"version": "2.6.0"
1067+
"version": "2.12.0"
10681068
}
10691069
}
10701070
],
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
psycopg2-binary==2.9.9
2-
alibi-detect==0.11.4
1+
psycopg2-binary==2.9.13
2+
alibi-detect==0.13.0

‎docs/modules/demos/pages/signal-processing.adoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ To achieve the same imports as mentioned in the previous section, build the Dock
9090

9191
[source,console]
9292
----
93-
FROM jupyter/pyspark-notebook:python-3.9
93+
FROM quay.io/jupyter/pyspark-notebook:python-3.13
9494
9595
COPY demos/signal-processing/requirements.txt .
9696
@@ -102,8 +102,8 @@ Where `requirements.txt` contains:
102102

103103
[source,console]
104104
----
105-
psycopg2-binary==2.9.9
106-
alibi-detect==0.11.4
105+
psycopg2-binary==2.9.13
106+
alibi-detect==0.13.0
107107
----
108108

109109
NOTE: Using a custom image requires access to a repository where the image can be made available.

‎stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: nifi
66
spec:
77
image:
8-
productVersion: 2.9.0
8+
productVersion: 2.12.0
99
clusterConfig:
1010
authentication:
1111
- authenticationClass: nifi-admin-credentials

‎stacks/nifi-kafka-druid-superset-s3/nifi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: nifi
66
spec:
77
image:
8-
productVersion: 2.9.0
8+
productVersion: 2.12.0
99
clusterConfig:
1010
authentication:
1111
- authenticationClass: nifi-admin-credentials

‎stacks/signal-processing/jupyterhub.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ options:
4141
# TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that
4242
# the demo is reproducable for the release and it will be automatically replaced for the release branch.
4343
name: oci.stackable.tech/demos/jupyter-pyspark-with-alibi-detect
44-
tag: python-3.9
44+
tag: python-3.12
4545
cloudMetadata:
4646
# Disable, otherwise we get Back-off restarting failed container block-cloud-metadata in pod:
4747
# block-cloud-metadata iptables v1.8.9 (legacy): can't initialize iptables table `filter': Table does not exist (do you need to insmod?)

0 commit comments

Comments
 (0)