main merge

razvan · razvan · commit a12c05dab644 · 2025-02-18T09:40:11.000+01:00
diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
@@ -6,7 +6,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_TOOLCHAIN_VERSION: "1.82.0"
+  RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
   HADOLINT_VERSION: "v2.12.0"
   PYTHON_VERSION: "3.12"
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,8 +17,6 @@ repos:
   - repo: https://github.com/doublify/pre-commit-rust
     rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
     hooks:
-      - id: fmt
-        args: ["--all", "--", "--check"]
       - id: clippy
         args: ["--all-targets", "--", "-D", "warnings"]
 
@@ -76,3 +74,10 @@ repos:
         entry: cargo test
         stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
+
+      - id: cargo-rustfmt
+        name: cargo-rustfmt
+        language: system
+        entry: cargo +nightly-2025-01-15 fmt --all -- --check
+        stages: [pre-commit]
+        pass_filenames: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,18 @@
 - Run a `containerdebug` process in the background of each Superset container to collect debugging information ([#578]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#585]).
 - Support OPA role mapping as optional custom security manager for Superset ([#582]).
+- Support for version `4.1.1` ([#595]).
 
 ### Changed
 
 - Default to OCI for image metadata and product image selection ([#586]).
 
+[#578]: https://github.com/stackabletech/superset-operator/pull/578
+[#582]: https://github.com/stackabletech/superset-operator/pull/582
+[#585]: https://github.com/stackabletech/superset-operator/pull/585
+[#586]: https://github.com/stackabletech/superset-operator/pull/586
+[#595]: https://github.com/stackabletech/superset-operator/pull/595
+
 ## [24.11.1] - 2025-01-10
 
 ### Fixed
@@ -23,10 +30,6 @@
 
 [#568]: https://github.com/stackabletech/superset-operator/pull/568
 [#569]: https://github.com/stackabletech/superset-operator/pull/569
-[#578]: https://github.com/stackabletech/superset-operator/pull/578
-[#582]: https://github.com/stackabletech/superset-operator/pull/582
-[#585]: https://github.com/stackabletech/superset-operator/pull/585
-[#586]: https://github.com/stackabletech/superset-operator/pull/586
 
 ## [24.11.0] - 2024-11-18
 
diff --git a/deploy/helm/superset-operator/templates/deployment.yaml b/deploy/helm/superset-operator/templates/deployment.yaml
@@ -16,8 +16,8 @@ spec:
     metadata:
       annotations:
         internal.stackable.tech/image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-        {{- with .Values.podAnnotations }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       labels:
diff --git a/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml b/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml
@@ -13,7 +13,7 @@ spec:
         name: config
       containers:
       - name: superset
-        image: oci.stackable.tech/sdp/superset:4.0.2-stackable0.0.0-dev
+        image: oci.stackable.tech/sdp/superset:4.1.1-stackable0.0.0-dev
         command: [
           "/bin/sh",
           "-c",
diff --git a/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml.j2 b/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml.j2
@@ -13,7 +13,7 @@ spec:
         name: config
       containers:
       - name: superset
-        image: oci.stackable.tech/sdp/superset:4.0.2-stackable{{ versions.superset }}
+        image: oci.stackable.tech/sdp/superset:4.1.1-stackable{{ versions.superset }}
         command: [
           "/bin/sh",
           "-c",
diff --git a/docs/modules/superset/examples/getting_started/superset.yaml b/docs/modules/superset/examples/getting_started/superset.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-superset
 spec:
   image:
-    productVersion: 4.0.2
+    productVersion: 4.1.1
   clusterConfig:
     credentialsSecret: simple-superset-credentials
     listenerClass: external-unstable
diff --git a/docs/modules/superset/pages/usage-guide/security.adoc b/docs/modules/superset/pages/usage-guide/security.adoc
@@ -34,7 +34,7 @@ metadata:
   name: superset-with-ldap-server
 spec:
   image:
-    productVersion: 4.0.2
+    productVersion: 4.1.1
   clusterConfig:
     authentication:
     - authenticationClass: ldap    # <1>
@@ -64,7 +64,7 @@ metadata:
   name: superset-with-oidc
 spec:
   image:
-    productVersion: 4.0.2
+    productVersion: 4.1.1
   clusterConfig:
     authentication:
     - authenticationClass: keycloak                        # <1>
@@ -229,7 +229,7 @@ metadata:
   name: superset-with-oidc
 spec:
   image:
-    productVersion: 4.0.2
+    productVersion: 4.1.1
   clusterConfig:
     authentication:
     - authenticationClass: keycloak
diff --git a/docs/modules/superset/partials/supported-versions.adoc b/docs/modules/superset/partials/supported-versions.adoc
@@ -3,3 +3,4 @@
 // Stackable Platform documentation.
 
 - 4.0.2 (LTS)
+- 4.1.1
diff --git a/examples/superset-with-ldap.yaml b/examples/superset-with-ldap.yaml
@@ -149,7 +149,7 @@ metadata:
   name: superset-with-ldap-server-veri-tls
 spec:
   image:
-    productVersion: 4.0.2
+    productVersion: 4.1.1
   clusterConfig:
     authentication:
       - authenticationClass: superset-with-ldap-server-veri-tls-ldap
diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
@@ -21,11 +21,8 @@ pub fn get_affinity(cluster_name: &str, role: &SupersetRole) -> StackableAffinit
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     use std::collections::BTreeMap;
 
-    use crate::SupersetCluster;
     use stackable_operator::{
         commons::affinity::StackableAffinity,
         k8s_openapi::{
@@ -34,6 +31,9 @@ mod tests {
         },
     };
 
+    use super::*;
+    use crate::SupersetCluster;
+
     #[test]
     fn test_affinity_defaults() {
         let input = r#"
@@ -43,7 +43,7 @@ mod tests {
           name: simple-superset
         spec:
           image:
-            productVersion: 4.0.2
+            productVersion: 4.1.1
           clusterConfig:
             credentialsSecret: superset-db-credentials
           nodes:
diff --git a/rust/crd/src/authentication.rs b/rust/crd/src/authentication.rs
@@ -324,11 +324,16 @@ mod tests {
     use std::pin::Pin;
 
     use indoc::indoc;
-    use stackable_operator::commons::networking::HostName;
-    use stackable_operator::commons::tls_verification::{
-        CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification,
+    use stackable_operator::{
+        commons::{
+            authentication::oidc,
+            networking::HostName,
+            tls_verification::{
+                CaCert, Tls, TlsClientDetails, TlsServerVerification, TlsVerification,
+            },
+        },
+        kube,
     };
-    use stackable_operator::{commons::authentication::oidc, kube};
 
     use super::*;
 
diff --git a/rust/crd/src/druidconnection.rs b/rust/crd/src/druidconnection.rs
@@ -1,10 +1,10 @@
 use serde::{Deserialize, Serialize};
 use snafu::Snafu;
-use stackable_operator::k8s_openapi::apimachinery::pkg::apis::meta::v1::Time;
-use stackable_operator::k8s_openapi::chrono::Utc;
-use stackable_operator::kube::CustomResource;
-use stackable_operator::kube::ResourceExt;
-use stackable_operator::schemars::{self, JsonSchema};
+use stackable_operator::{
+    k8s_openapi::{apimachinery::pkg::apis::meta::v1::Time, chrono::Utc},
+    kube::{CustomResource, ResourceExt},
+    schemars::{self, JsonSchema},
+};
 
 #[derive(Snafu, Debug)]
 #[allow(clippy::enum_variant_names)]
diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
@@ -17,7 +17,8 @@ use stackable_operator::{
         },
     },
     config::{
-        fragment::{self, Fragment, ValidationError},
+        fragment,
+        fragment::{Fragment, ValidationError},
         merge::Merge,
     },
     k8s_openapi::apimachinery::pkg::api::resource::Quantity,
diff --git a/rust/operator-binary/src/authorization/opa.rs b/rust/operator-binary/src/authorization/opa.rs
@@ -1,7 +1,6 @@
-use stackable_operator::time::Duration;
 use std::collections::BTreeMap;
 
-use stackable_operator::{client::Client, commons::opa::OpaApiVersion};
+use stackable_operator::{client::Client, commons::opa::OpaApiVersion, time::Duration};
 use stackable_superset_crd::{SupersetCluster, SupersetOpaConfig};
 
 pub struct SupersetOpaConfigResolved {
diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -1,3 +1,5 @@
+use std::collections::BTreeMap;
+
 use indoc::formatdoc;
 use snafu::{ResultExt, Snafu};
 use stackable_operator::commons::authentication::{ldap, oidc};
@@ -8,7 +10,6 @@ use stackable_superset_crd::{
     },
     SupersetConfigOptions,
 };
-use std::collections::BTreeMap;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
diff --git a/rust/operator-binary/src/druid_connection_controller.rs b/rust/operator-binary/src/druid_connection_controller.rs
@@ -1,5 +1,3 @@
-use crate::util::{get_job_state, JobState};
-
 use std::sync::Arc;
 
 use const_format::concatcp;
@@ -16,8 +14,7 @@ use stackable_operator::{
         core::v1::{ConfigMap, PodSpec, PodTemplateSpec},
     },
     kube::{
-        core::DynamicObject,
-        core::{error_boundary, DeserializeGuard},
+        core::{error_boundary, DeserializeGuard, DynamicObject},
         runtime::{controller::Action, reflector::ObjectRef},
         ResourceExt,
     },
@@ -31,7 +28,12 @@ use stackable_superset_crd::{
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 
-use crate::{rbac, superset_controller::DOCKER_IMAGE_BASE_NAME, APP_NAME, OPERATOR_NAME};
+use crate::{
+    rbac,
+    superset_controller::DOCKER_IMAGE_BASE_NAME,
+    util::{get_job_state, JobState},
+    APP_NAME, OPERATOR_NAME,
+};
 
 pub const DRUID_CONNECTION_CONTROLLER_NAME: &str = "druid-connection";
 pub const DRUID_CONNECTION_FULL_CONTROLLER_NAME: &str =
diff --git a/rust/operator-binary/src/util.rs b/rust/operator-binary/src/util.rs
@@ -1,8 +1,8 @@
-use crate::OPERATOR_NAME;
-use stackable_operator::k8s_openapi::api::batch::v1::Job;
-use stackable_operator::kvp::ObjectLabels;
+use stackable_operator::{k8s_openapi::api::batch::v1::Job, kvp::ObjectLabels};
 use stackable_superset_crd::APP_NAME;
 
+use crate::OPERATOR_NAME;
+
 pub enum JobState {
     InProgress,
     Complete,
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1,5 @@
+# This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code.
+# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered.
+
+imports_granularity = "Crate"
+group_imports =  "StdExternalCrate"
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -7,9 +7,10 @@ dimensions:
   - name: superset
     values:
       - 4.0.2
+      - 4.1.1
   - name: superset-latest
     values:
-      - 4.0.2
+      - 4.1.1
   - name: ldap-authentication
     values:
       - no-tls

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@`
`3`	`3`	`// Stackable Platform documentation.`
`4`	`4`
`5`	`5`	`- 4.0.2 (LTS)`
	`6`	`+- 4.1.1`