adapted to new releases / crds / nifi version

Author: maltesander

modules/tutorials/attachments/s3-kafka.xml

@@ -93,7 +93,7 @@
  <bundle>
  <artifact>nifi-record-serialization-services-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <comments/>
  <descriptors>
@@ -379,7 +379,7 @@
  <bundle>
  <artifact>nifi-record-serialization-services-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <comments/>
  <descriptors>
@@ -594,7 +594,7 @@
  <bundle>
  <artifact>nifi-record-serialization-services-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <comments/>
  <descriptors>
@@ -738,7 +738,7 @@
  <bundle>
  <artifact>nifi-aws-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <config>
  <bulletinLevel>WARN</bulletinLevel>
@@ -1017,7 +1017,7 @@
  <bundle>
  <artifact>nifi-aws-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <config>
  <bulletinLevel>WARN</bulletinLevel>
@@ -1258,7 +1258,7 @@
  <bundle>
  <artifact>nifi-kafka-2-6-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <config>
  <bulletinLevel>WARN</bulletinLevel>
@@ -1577,7 +1577,7 @@
  <bundle>
  <artifact>nifi-standard-nar</artifact>
  <group>org.apache.nifi</group>
- <version>1.15.0</version>
+ <version>1.16.3</version>
  </bundle>
  <config>
  <bulletinLevel>WARN</bulletinLevel>

modules/tutorials/pages/end-to-end_data_pipeline_example.adoc

@@ -105,9 +105,9 @@ helm install nifi-operator stackable-stable/nifi-operator
 ----
 ====
 
-=== Deploying Kafka and NiFi
+=== Deploying ZooKeeper
 
-To deploy Kafka and NiFi you can now apply the cluster configuration. You'll also need to deploy ZooKeeper, since both Kafka and NiFi depend on it. Run the following command in the console to deploy and configure all three services.
+Since both Kafka and NiFi depend on Apache ZooKeeper, we will create a ZooKeeper cluster first.
 
 [source,bash]
 kubectl apply -f - <<EOF
@@ -117,7 +117,7 @@ kind: ZookeeperCluster
 metadata:
  name: simple-zk
 spec:
- version: 3.8.0-stackable0.1.0
+ version: 3.8.0-stackable0.7.1
  servers:
  roleGroups:
  default:
@@ -126,6 +126,14 @@ spec:
  kubernetes.io/os: linux
  replicas: 1
  config: {}
+EOF
+
+=== Deploying Kafka and NiFi
+
+To deploy Kafka and NiFi you can now apply the cluster configuration. Run the following command in the console to deploy and configure all three services.
+
+[source,bash]
+kubectl apply -f - <<EOF
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperZnode
@@ -374,13 +382,26 @@ Now that the Operator and Dependencies are set up, you can deploy the Druid clus
 
 [source]
 kubectl apply -f - <<EOF
+---
+apiVersion: secrets.stackable.tech/v1alpha1
+kind: SecretClass
+metadata:
+ name: druid-s3-credentials
+spec:
+ backend:
+ k8sSearch:
+ searchNamespace:
+ pod: {}
+---
 apiVersion: v1
 kind: Secret
 metadata:
  name: druid-s3-credentials
+ labels:
+ secrets.stackable.tech/class: druid-s3-credentials
 stringData:
- accessKeyId: minioAccessKey
- secretAccessKey: minioSecretKey
+ accessKey: minioAccessKey
+ secretKey: minioSecretKey
 EOF
 
 And now the cluster definition:
@@ -401,13 +422,30 @@ spec:
  port: 5432
  user: druid
  password: druid
- s3:
- endpoint: http://minio:9000
- credentialsSecret: druid-s3-credentials # <3>
+ ingestion:
+ s3connection:
+ inline:
+ host: http://minio
+ port: 9000
+ accessStyle: Path
+ credentials:
+ secretClass: druid-s3-credentials # <3>
  deepStorage:
  storageType: s3
  bucket: nytaxidata
  baseKey: storage
+ deepStorage:
+ s3:
+ bucket:
+ inline:
+ bucketName: nytaxidata
+ connection:
+ inline:
+ host: http://minio
+ port: 9000
+ accessStyle: Path
+ credentials:
+ secretClass: druid-s3-credentials # <3>
  brokers:
  configOverrides:
  runtime.properties:
@@ -484,7 +522,7 @@ kubectl port-forward svc/druid-nytaxidata-router 8888
 
 Keep this command running to continue accessing the Router port locally.
 
-The UI should now be reachable at http://localhost:8888 and should look like the screenshot below. Start with the “Load Data” option:
+The UI should now be reachable at http://localhost:8888 and should look like the screenshot below. Start with the "Load Data" and "New Spec" option:
 
 image::end-to-end_data_pipeline_example/druid-main.png[Main Screen]