Merge remote-tracking branch 'origin/main' into refactor/remove-product-config

Author: maltesander

docs/modules/nifi/assets/images/put-iceberg-processor.png

@@ -110,6 +110,9 @@ spec:
 
 You can follow the xref:tutorials:authentication_with_openldap.adoc[] tutorial to learn how to set up an AuthenticationClass for an LDAP server, as well as consulting the {crd-docs}/authentication.stackable.tech/authenticationclass/v1alpha1/[AuthenticationClass reference {external-link-icon}^].
 
+If your LDAP server uses TLS, the AuthenticationClass also needs to know how to verify the server's certificate.
+See xref:concepts:tls-server-verification.adoc[] for how to provide the LDAP server's CA certificate via a SecretClass.
+
 [#authentication-oidc]
 === OIDC
 

docs/modules/nifi/pages/usage_guide/security.adoc

@@ -33,91 +33,3 @@ Please read on https://github.com/stackabletech/nifi-iceberg-bundle[its document
 You don't need any special configs on the `NiFiCluster` in case you are using S3 and no Kerberos.
 
 HDFS and Kerberos are also supported, please have a look at the https://github.com/stackabletech/nifi-operator/tree/main/tests/templates/kuttl/iceberg[Iceberg integration test] for that.
-
-== NiFi 1
-
-Starting with `1.19.0`, NiFi supports writing to Iceberg tables.
-
-The following example shows an example NiFi setup using the Iceberg integration.
-
-[source,yaml]
-----
-apiVersion: nifi.stackable.tech/v1alpha1
-kind: NifiCluster
-metadata:
-  name: nifi
-spec:
-  clusterConfig:
-    # ...
-    extraVolumes:
-      # Will be mounted at /stackable/userdata/nifi-hive-s3-config/
-      - name: nifi-hive-s3-config
-        secret:
-          secretName: nifi-hive-s3-config
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: nifi-hive-s3-config
-stringData:
-  core-site.xml: |
-    <configuration>
-      <property>
-        <name>fs.s3a.aws.credentials.provider</name>
-        <value>org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider</value>
-      </property>
-
-      <property>
-        <name>fs.s3a.endpoint</name>
-        <value>http://minio:9000</value>
-      </property>
-
-      <property>
-        <name>fs.s3a.access.key</name>
-        <value>xxx</value>
-      </property>
-
-      <property>
-        <name>fs.s3a.secret.key</name>
-        <value>xxx</value>
-      </property>
-
-      <property>
-        <name>fs.s3a.path.style.access</name>
-        <value>true</value>
-      </property>
-
-      <property>
-        <name>fs.s3a.connection.ssl.enabled</name>
-        <value>false</value>
-        <description>Enables or disables SSL connections to S3.</description>
-      </property>
-    </configuration>
-----
-
-Please fill in the correct endpoint, access key and secret key for your S3 store, this is a classic Hadoop config file.
-
-Use e.g. Trino to create a table for Nifi to write into using something like
-
-[source,sql]
-----
-CREATE SCHEMA IF NOT EXISTS lakehouse.demo WITH (location = 's3a://lakehouse/demo/');
-
-CREATE TABLE IF NOT EXISTS lakehouse.demo.test (
-    test varchar
-);
-----
-
-In NiFi you need to create a `HiveCatalogService` first which allows you to access the Hive Metastore storing the Iceberg metadata.
-Set `Hive Metastore URI` to something like `thrift://hive-iceberg.default.svc.cluster.local:9083`,
-`Default Warehouse Location` to `s3a://lakehouse`
-and `Hadoop Configuration Resources` to `/stackable/userdata/nifi-hive-s3-config/core-site.xml`.
-
-Afterwards you can create the `PutIceberg` processor and configure the `HiveCatalogService`.
-Also set `Catalog Namespace` to your schema name and the `Table Name`.
-
-For the `File Format` it is recommended to use `PARQUET` or `ORC` rather than `AVRO` for performance reasons, but you can leave it empty or choose your desired format.
-
-You should end up with the following `PutIceberg` processor:
-
-image::put-iceberg-processor.png[]

docs/modules/nifi/pages/usage_guide/writing-to-iceberg-tables.adoc

@@ -3,9 +3,8 @@
 // Stackable Platform documentation.
 
 * 2.9.0
-* 2.7.2
+* 2.7.2 (Deprecated)
 ** Please note that NiFi starting with 2.7.2 supports Iceberg, but only with S3 and Iceberg REST catalog (no Hive metastore or HDFS support). Please read on xref:nifi:usage_guide/writing-to-iceberg-tables.adoc[] for details.
 * 2.6.0 (LTS)
-* 1.28.1 (Deprecated)
 
 For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[].

docs/modules/nifi/partials/supported-versions.adoc

@@ -166,12 +166,12 @@ metadata:
   name: nifi
 spec:
   image:
-{% if test_scenario['values']['nifi-v2'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['nifi-v2'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['nifi-v2'].split(',')[0] }}"
+{% if test_scenario['values']['nifi'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['nifi'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['nifi'].split(',')[0] }}"
 {% else %}
     custom: null
-    productVersion: "{{ test_scenario['values']['nifi-v2'] }}"
+    productVersion: "{{ test_scenario['values']['nifi'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:

tests/templates/kuttl/cluster-sync-cs-bug/20-install-nifi.yaml.j2

@@ -148,7 +148,7 @@ data:
           "bundle": {
             "group": "org.apache.nifi",
             "artifact": "nifi-prometheus-nar",
-            "version": "1.28.1"
+            "version": "2.9.0"
           },
           "properties": {
             "prometheus-reporting-task-metrics-endpoint-port": "8081",
@@ -190,7 +190,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-standard-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "Regular Expression": "(?s)(^.*$)",
@@ -235,7 +235,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-standard-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "HTTP Context Map": "fd3b17c4-0196-1000-0000-000076ed786c",
@@ -311,7 +311,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-standard-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "multipart-request-max-size": "1 MB",
@@ -475,7 +475,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-http-context-map-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "Request Expiration": "1 min",
@@ -488,7 +488,7 @@ data:
                 "bundle": {
                   "group": "org.apache.nifi",
                   "artifact": "nifi-standard-services-api-nar",
-                  "version": "1.28.1"
+                  "version": "2.9.0"
                 }
               }
             ],