Remove all unneeded code

Author: sbernauer

extra/crds.yaml

@@ -139,33 +139,6 @@ spec:
                         - accessPolicyProvider
                         type: object
                     type: object
-                  createReportingTaskJob:
-                    default:
-                      enabled: true
-                      podOverrides: {}
-                    description: |-
-                      This section creates a `create-reporting-task` Kubernetes Job, which enables the export of
-                      Prometheus metrics within NiFi.
-                    properties:
-                      enabled:
-                        default: true
-                        description: |-
-                          Whether the Kubernetes Job should be created, defaults to true. It can be helpful to disable
-                          the Job, e.g. when you configOverride an authentication mechanism, which the Job currently
-                          can't use to authenticate against NiFi.
-                        type: boolean
-                      podOverrides:
-                        default: {}
-                        description: |-
-                          Here you can define a
-                          [PodTemplateSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#podtemplatespec-v1-core)
-                          to override any property that can be set on the Pod of the create-reporting-task Kubernetes Job.
-                          Read the
-                          [Pod overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#pod-overrides)
-                          for more information.
-                        type: object
-                        x-kubernetes-preserve-unknown-fields: true
-                    type: object
                   customComponentsGitSync:
                     default: []
                     description: |-
@@ -347,26 +320,11 @@ spec:
                           `nifiPbkdf2AesGcm256` (the default value),
                           `nifiArgon2AesGcm256`,
 
-                          The following algorithms are deprecated and will be removed in future versions:
-
-                          `nifiArgon2AesGcm128`,
-                          `nifiBcryptAesGcm128`,
-                          `nifiBcryptAesGcm256`,
-                          `nifiPbkdf2AesGcm128`,
-                          `nifiScryptAesGcm128`,
-                          `nifiScryptAesGcm256`.
-
                           Learn more about the specifics of the algorithm parameters in the
                           [NiFi documentation](https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#property-encryption-algorithms).
                         enum:
                         - nifiPbkdf2AesGcm256
                         - nifiArgon2AesGcm256
-                        - nifiBcryptAesGcm128
-                        - nifiBcryptAesGcm256
-                        - nifiPbkdf2AesGcm128
-                        - nifiArgon2AesGcm128
-                        - nifiScryptAesGcm128
-                        - nifiScryptAesGcm256
                         - null
                         nullable: true
                         type: string
@@ -422,8 +380,7 @@ spec:
                       When using the [Stackable operator for Apache ZooKeeper](https://docs.stackable.tech/home/nightly/zookeeper/)
                       to deploy a ZooKeeper cluster, this will simply be the name of your ZookeeperCluster resource.
 
-                      The Kubernetes provider will be used if this field is unset. Kubernetes is only supported for NiFi 2.x and newer,
-                      NiFi 1.x requires ZooKeeper.
+                      The Kubernetes provider will be used if this field is unset.
                     maxLength: 253
                     minLength: 1
                     pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$

rust/operator-binary/src/controller/build.rs

@@ -23,8 +23,6 @@ pub const PROTOCOL_PORT_NAME: &str = "protocol";
 pub const PROTOCOL_PORT: Port = Port(9088);
 pub const BALANCE_PORT_NAME: &str = "balance";
 pub const BALANCE_PORT: Port = Port(6243);
-pub const METRICS_PORT_NAME: &str = "metrics";
-pub const METRICS_PORT: Port = Port(8081);
 
 // Filesystem paths shared by multiple builders. Single-consumer paths live in their builder.
 pub const NIFI_CONFIG_DIRECTORY: &str = "/stackable/nifi/conf";

rust/operator-binary/src/controller/build/properties.rs

@@ -94,8 +94,8 @@ pub(crate) mod test_support {
 
     use crate::{
         controller::{
-            NifiRoleGroupConfig, ValidatedCluster, ValidatedClusterConfig, ValidatedReportingTask,
-            ValidatedRoleConfig, ValidatedSensitiveProperties, validate::build_role_group_configs,
+            NifiRoleGroupConfig, ValidatedCluster, ValidatedClusterConfig, ValidatedRoleConfig,
+            ValidatedSensitiveProperties, validate::build_role_group_configs,
         },
         crd::{NifiRole, v1alpha1},
         security::{
@@ -105,8 +105,7 @@ pub(crate) mod test_support {
     };
 
     /// A minimal NiFi cluster YAML.  Mirrors the fixture used by bootstrap_conf tests,
-    /// stripped down to the mandatory fields only (NiFi 2.x, Kubernetes clustering backend,
-    /// SingleUser auth).
+    /// stripped down to the mandatory fields only (Kubernetes clustering backend, SingleUser auth).
     pub const MINIMAL_NIFI_YAML: &str = r#"
         apiVersion: nifi.stackable.tech/v1alpha1
         kind: NifiCluster
@@ -196,15 +195,6 @@ pub(crate) mod test_support {
                 },
                 server_tls_secret_class: nifi.server_tls_secret_class().clone(),
                 extra_volumes: nifi.spec.cluster_config.extra_volumes.clone(),
-                reporting_task: ValidatedReportingTask {
-                    enabled: nifi.spec.cluster_config.create_reporting_task_job.enabled,
-                    pod_overrides: nifi
-                        .spec
-                        .cluster_config
-                        .create_reporting_task_job
-                        .pod_overrides
-                        .clone(),
-                },
                 host_header_check: nifi.spec.cluster_config.host_header_check.clone(),
             },
         )

rust/operator-binary/src/controller/build/properties/nifi_properties.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeMap;
 
-use snafu::{ResultExt, Snafu, ensure};
+use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     memory::MemoryQuantity,
     role_utils::{ZeroReplicasCounting, fixed_replica_count},
@@ -51,11 +51,6 @@ pub enum Error {
     GenerateOidcConfig {
         source: crate::security::oidc::Error,
     },
-
-    #[snafu(display(
-        "NiFi 1.x requires ZooKeeper (hint: upgrade to NiFi 2.x or set .spec.clusterConfig.zookeeperConfigMapName)"
-    ))]
-    Nifi1RequiresZookeeper,
 }
 
 /// NiFi Python (`nipy`) extension directories, mounted only by the `nifi.properties` builder.
@@ -72,36 +67,15 @@ pub fn build(
     proxy_hosts: &str,
 ) -> Result<String, Error> {
     let git_sync_resources = &rg.config.git_sync_resources;
-    let product_version = &cluster.image.product_version;
     let auth_config = &cluster.cluster_config.authentication;
     let resource_config = &rg.config.resources;
 
-    // TODO: Remove once we dropped support for all NiFi 1.x versions
-    let is_nifi_1 = product_version.starts_with("1.");
-
     let mut properties = BTreeMap::new();
     // Core Properties
-    // According to https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance#MigrationGuidance-Migratingto2.0.0-M1
-    // The nifi.flow.configuration.file property in nifi.properties must be changed to reference
-    // "flow.json.gz" instead of "flow.xml.gz"
-    // TODO: Remove once we dropped support for all 1.x.x versions
-    // TODO(malte): In order to use CLI tools like: ./bin/nifi.sh set-sensitive-properties-algorithm NIFI_PBKDF2_AES_GCM_256
-    // we have to set both "nifi.flow.configuration.file" and "nifi.flow.configuration.json.file" in NiFi 1.x.x.
-    if is_nifi_1 {
-        properties.insert(
-            "nifi.flow.configuration.file".to_string(),
-            NifiRepository::Database.mount_path() + "/flow.xml.gz",
-        );
-        properties.insert(
-            "nifi.flow.configuration.json.file".to_string(),
-            NifiRepository::Database.mount_path() + "/flow.json.gz",
-        );
-    } else {
-        properties.insert(
-            "nifi.flow.configuration.file".to_string(),
-            NifiRepository::Database.mount_path() + "/flow.json.gz",
-        );
-    }
+    properties.insert(
+        "nifi.flow.configuration.file".to_string(),
+        NifiRepository::Database.mount_path() + "/flow.json.gz",
+    );
 
     properties.insert(
         "nifi.flow.configuration.archive.enabled".to_string(),
@@ -454,7 +428,6 @@ pub fn build(
         "".to_string(),
     );
 
-    // The algorithm has already been validated in the validate step (check_for_nifi_version).
     properties.insert(
         "nifi.sensitive.props.algorithm".to_string(),
         cluster
@@ -572,8 +545,6 @@ pub fn build(
         }
 
         v1alpha1::NifiClusteringBackend::Kubernetes {} => {
-            ensure!(!is_nifi_1, Nifi1RequiresZookeeperSnafu);
-
             properties.insert(
                 "nifi.cluster.leader.election.implementation".to_string(),
                 "KubernetesLeaderElectionManager".to_string(),
@@ -590,9 +561,6 @@ pub fn build(
     //####################
     // Custom components #
     //####################
-    // NiFi 1.x does not support Python components and the Python configuration below is just
-    // ignored.
-
     // The command used to launch Python.
     // This property must be set to enable Python-based processors.
     properties.insert("nifi.python.command".to_string(), "python3".to_string());
@@ -807,53 +775,6 @@ mod tests {
         );
     }
 
-    /// NiFi 1.x cannot use the Kubernetes clustering backend, so building must fail.
-    #[test]
-    fn kubernetes_backend_is_rejected_on_nifi_1() {
-        let mut cluster = minimal_validated_cluster();
-        cluster.image.product_version = "1.27.0".to_string();
-        let rg = default_rg(&cluster);
-
-        let error = build(&cluster, rg, "*")
-            .expect_err("NiFi 1.x with the Kubernetes backend must be rejected");
-
-        assert!(matches!(error, Error::Nifi1RequiresZookeeper));
-    }
-
-    /// NiFi 1.x with the ZooKeeper backend is valid.
-    #[test]
-    fn zookeeper_backend_is_allowed_on_nifi_1() {
-        let mut cluster = minimal_validated_cluster();
-        cluster.image.product_version = "1.27.0".to_string();
-        cluster.cluster_config.clustering_backend = v1alpha1::NifiClusteringBackend::ZooKeeper {
-            zookeeper_config_map_name: "my-zk".parse().expect("valid ConfigMap name"),
-        };
-        let rg = default_rg(&cluster);
-
-        assert!(build(&cluster, rg, "*").is_ok());
-    }
-
-    /// NiFi 2.x configures only the JSON flow file; NiFi 1.x configures both the XML and JSON files.
-    #[test]
-    fn flow_configuration_files_differ_between_nifi_versions() {
-        let cluster_2 = minimal_validated_cluster(); // NiFi 2.x
-        let props_2 = build(&cluster_2, default_rg(&cluster_2), "*").expect("build should succeed");
-        assert!(props_2.contains("nifi.flow.configuration.file="));
-        assert!(props_2.contains("flow.json.gz"));
-        assert!(!props_2.contains("flow.xml.gz"));
-        assert!(!props_2.contains("nifi.flow.configuration.json.file="));
-
-        let mut cluster_1 = minimal_validated_cluster();
-        cluster_1.image.product_version = "1.27.0".to_string();
-        // NiFi 1.x must use the ZooKeeper backend.
-        cluster_1.cluster_config.clustering_backend = v1alpha1::NifiClusteringBackend::ZooKeeper {
-            zookeeper_config_map_name: "my-zk".parse().expect("valid ConfigMap name"),
-        };
-        let props_1 = build(&cluster_1, default_rg(&cluster_1), "*").expect("build should succeed");
-        assert!(props_1.contains("flow.xml.gz"));
-        assert!(props_1.contains("nifi.flow.configuration.json.file="));
-    }
-
     /// The flow archive max storage is the flowfile-repo capacity scaled by the 0.9 utilization
     /// factor (default capacity 1024Mi -> ~921 MB).
     #[test]

rust/operator-binary/src/controller/build/proxy_hosts.rs

@@ -2,17 +2,11 @@
 
 use std::collections::HashSet;
 
-use stackable_operator::utils::cluster_info::KubernetesClusterInfo;
-
 use crate::controller::{
     ValidatedCluster,
     build::{
-        HTTPS_PORT,
         properties::env_reference,
-        resource::{
-            reporting_task,
-            statefulset::{LISTENER_DEFAULT_ADDRESS_ENV, LISTENER_DEFAULT_PORT_HTTPS_ENV},
-        },
+        resource::statefulset::{LISTENER_DEFAULT_ADDRESS_ENV, LISTENER_DEFAULT_PORT_HTTPS_ENV},
     },
 };
 
@@ -21,10 +15,7 @@ use crate::controller::{
 /// The proxy hosts allow-list lets external users access NiFi via addresses we cannot predict,
 /// so all of them are added to the setting. For more information see
 /// <https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#proxy_configuration>
-pub fn compute_proxy_hosts(
-    cluster: &ValidatedCluster,
-    cluster_info: &KubernetesClusterInfo,
-) -> String {
+pub fn compute_proxy_hosts(cluster: &ValidatedCluster) -> String {
     let host_header_check = &cluster.cluster_config.host_header_check;
 
     if host_header_check.allow_all {
@@ -47,17 +38,6 @@ pub fn compute_proxy_hosts(
     )]);
     proxy_hosts.extend(host_header_check.additional_allowed_hosts.iter().cloned());
 
-    // Reporting task only exists for NiFi 1.x
-    if cluster.image.product_version.starts_with("1.") {
-        let reporting_task_service_name = reporting_task::build_reporting_task_fqdn_service_name(
-            cluster.name.as_ref(),
-            &cluster.namespace,
-            cluster_info,
-        );
-
-        proxy_hosts.insert(format!("{reporting_task_service_name}:{HTTPS_PORT}"));
-    }
-
     let mut proxy_hosts = Vec::from_iter(proxy_hosts);
     proxy_hosts.sort();
 
@@ -66,21 +46,9 @@ pub fn compute_proxy_hosts(
 
 #[cfg(test)]
 mod tests {
-    use std::str::FromStr;
-
-    use stackable_operator::{
-        commons::networking::DomainName, utils::cluster_info::KubernetesClusterInfo,
-    };
-
     use super::compute_proxy_hosts;
     use crate::controller::build::properties::test_support::minimal_validated_cluster;
 
-    fn cluster_info() -> KubernetesClusterInfo {
-        KubernetesClusterInfo {
-            cluster_domain: DomainName::from_str("cluster.local").expect("valid cluster domain"),
-        }
-    }
-
     /// `allow_all` short-circuits to `*` and ignores any additional allowed hosts.
     #[test]
     fn allow_all_returns_wildcard_and_ignores_additional_hosts() {
@@ -91,21 +59,21 @@ mod tests {
             .host_header_check
             .additional_allowed_hosts = vec!["ignored.example.com".to_string()];
 
-        assert_eq!(compute_proxy_hosts(&cluster, &cluster_info()), "*");
+        assert_eq!(compute_proxy_hosts(&cluster), "*");
     }
 
     /// Without `allow_all`, the listener placeholder is always present and user-provided hosts are
-    /// merged in, sorted and comma-joined. On NiFi 2.x no reporting-task FQDN is added.
+    /// merged in, sorted and comma-joined.
     #[test]
-    fn explicit_hosts_include_listener_placeholder_on_nifi_2() {
+    fn explicit_hosts_include_listener_placeholder() {
         let mut cluster = minimal_validated_cluster();
         cluster.cluster_config.host_header_check.allow_all = false;
         cluster
             .cluster_config
             .host_header_check
             .additional_allowed_hosts = vec!["extra.example.com".to_string()];
 
-        let hosts = compute_proxy_hosts(&cluster, &cluster_info());
+        let hosts = compute_proxy_hosts(&cluster);
 
         assert!(
             hosts.contains("${env:LISTENER_DEFAULT_ADDRESS}:${env:LISTENER_DEFAULT_PORT_HTTPS}"),
@@ -115,25 +83,5 @@ mod tests {
             hosts.contains("extra.example.com"),
             "expected the additional host in {hosts}"
         );
-        // No reporting-task FQDN on NiFi 2.x.
-        assert!(
-            !hosts.contains("cluster.local"),
-            "did not expect a reporting-task FQDN on NiFi 2.x in {hosts}"
-        );
-    }
-
-    /// On NiFi 1.x the reporting-task FQDN (which embeds the cluster domain) is added.
-    #[test]
-    fn nifi_1_adds_reporting_task_fqdn() {
-        let mut cluster = minimal_validated_cluster();
-        cluster.cluster_config.host_header_check.allow_all = false;
-        cluster.image.product_version = "1.27.0".to_string();
-
-        let hosts = compute_proxy_hosts(&cluster, &cluster_info());
-
-        assert!(
-            hosts.contains("cluster.local"),
-            "expected the reporting-task FQDN on NiFi 1.x in {hosts}"
-        );
     }
 }