New version 2.1.1, 3.0.1 (#415)

* bump vector aggregator * bump operator-rs to 0.55.0 * regenerate charts * adapt test versions * bump examples and docs * adapted changelog * adapted changelog * bump to 3.0.1 * set TALISMAN_ENABLED to false * adapted changelog * preserve overrides * merged and regenerated charts * mention override fix in changelog
stackabletech · Oct 20, 2023 · 448ff8b · 448ff8b
1 parent c0f5a8e
commit 448ff8b
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,22 +6,29 @@
 
 - Default stackableVersion to operator version ([#390]).
 - Support PodDisruptionBudgets ([#407]).
+- Added support for versions 2.1.1, 3.0.1 ([#415]).
 
 ### Changed
 
-- `vector` `0.26.0` -> `0.31.0` ([#391]).
-- `operator-rs` `0.44.0` -> `0.52.1` ([#390], [#407]).
+- `vector` `0.26.0` -> `0.33.0` ([#391], [#415]).
+- `operator-rs` `0.44.0` -> `0.55.0` ([#390], [#407], [#415]).
 - BREAKING: Removed SupersetDB object, since it created some problems when reinstalling or upgrading a Superset cluster. Instead, the initialization of the database was moved to the startup phase of each Superset pod. To make sure the initialization does not run in parallel, the `PodManagementPolicy` was set to `OrderedReady` and liveness/readiness probes were added. The `.spec.clusterConfig.loadExamplesOnInit` option was removed from the CRD, because loading the examples at every startup caused problems in certain scenarios, e.g. after an upgrade from Superset 1.5.3 to 2.1.0 ([#396]).
 
 ### Fixed
 
 - BREAKING: Rename Service port name from `superset` to `http` for consistency reasons. This change should normally not be breaking, as we only change the name, not the port. However, there might be some e.g. Ingresses that rely on the port name and need to be updated ([#394]).
+- Fixed config override support ([#415]).
+
+### Removed
+
+- Removed support for versions 1.3.2, 1.4.1, 1.4.2, 1.5.1, 1.5.3, 2.0.1 ([#415]).
 
 [#390]: https://github.com/stackabletech/superset-operator/pull/390
 [#391]: https://github.com/stackabletech/superset-operator/pull/391
 [#394]: https://github.com/stackabletech/superset-operator/pull/394
 [#396]: https://github.com/stackabletech/superset-operator/pull/396
 [#407]: https://github.com/stackabletech/superset-operator/pull/407
+[#415]: https://github.com/stackabletech/superset-operator/pull/415
 
 ## [23.7.0] - 2023-07-14
 

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: docker.stackable.tech/stackable/superset:2.1.0-stackable0.0.0-dev
+        image: docker.stackable.tech/stackable/superset:3.0.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: docker.stackable.tech/stackable/superset:2.1.0-stackable{{ versions.superset }}
+        image: docker.stackable.tech/stackable/superset:3.0.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: 2.1.0
+    productVersion: 3.0.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
@@ -19,7 +19,7 @@ metadata:
   name: superset-with-ldap-server
 spec:
   image:
-    productVersion: 2.1.0
+    productVersion: 3.0.1
   clusterConfig:
     authentication:
     - authenticationClass: ldap    # <1>
@@ -48,7 +48,7 @@ metadata:
   name: superset-with-oauth
 spec:
   image:
-    productVersion: 2.1.0
+    productVersion: 3.0.1
   [...]
   nodes:
     configOverrides:

diff --git a/docs/modules/superset/partials/supported-versions.adoc b/docs/modules/superset/partials/supported-versions.adoc
@@ -2,8 +2,6 @@
 // This is a separate file, since it is used by both the direct Superset documentation, and the overarching
 // Stackable Platform documentation.
 
-- 1.3.2
-- 1.4.1, 1.4.2
-- 1.5.1, 1.5.3
-- 2.0.1
-- 2.1.0
+- 3.0.1
+- 2.1.1
+- 2.1.0 (deprecated)
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: 2.1.0
+    productVersion: 3.0.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
@@ -46,7 +46,7 @@ mod tests {
           name: simple-superset
         spec:
           image:
-            productVersion: 2.1.0
+            productVersion: 3.0.1
           credentialsSecret: simple-superset-credentials
           nodes:
             roleGroups:
@@ -107,7 +107,7 @@ mod tests {
           name: simple-superset
         spec:
           image:
-            productVersion: 2.1.0
+            productVersion: 3.0.1
           credentialsSecret: simple-superset-credentials
           nodes:
             roleGroups:

diff --git a/rust/operator-binary/src/superset_controller.rs b/rust/operator-binary/src/superset_controller.rs
@@ -422,19 +422,31 @@ fn build_rolegroup_config_map(
     logging: &Logging<Container>,
     vector_aggregator_address: Option<&str>,
 ) -> Result<ConfigMap, Error> {
-    let mut config = rolegroup_config
-        .get(&PropertyNameKind::File(
-            SUPERSET_CONFIG_FILENAME.to_string(),
-        ))
-        .cloned()
-        .unwrap_or_default();
-
-    config::add_superset_config(&mut config, authentication_config);
+    let mut config_properties = BTreeMap::new();
+
+    // TODO: this is true per default for versions 3.0.0 and up.
+    //    We deactivate it here to keep existing functionality.
+    //    However this is a security issue and should be configured properly
+    //    Issue: https://github.com/stackabletech/superset-operator/issues/416
+    config_properties.insert("TALISMAN_ENABLED".to_string(), "False".to_string());
+
+    config::add_superset_config(&mut config_properties, authentication_config);
+
+    // The order here should be kept in order to preserve overrides.
+    // No properties should be added after this extend.
+    config_properties.extend(
+        rolegroup_config
+            .get(&PropertyNameKind::File(
+                SUPERSET_CONFIG_FILENAME.to_string(),
+            ))
+            .cloned()
+            .unwrap_or_default(),
+    );
 
     let mut config_file = Vec::new();
     flask_app_config_writer::write::<SupersetConfigOptions, _, _>(
         &mut config_file,
-        config.iter(),
+        config_properties.iter(),
         PYTHON_IMPORTS,
     )
     .with_context(|_| BuildRoleGroupConfigFileSnafu {

diff --git a/tests/templates/kuttl/logging/01-install-superset-vector-aggregator.yaml b/tests/templates/kuttl/logging/01-install-superset-vector-aggregator.yaml
@@ -5,7 +5,7 @@ commands:
   - script: >-
       helm install superset-vector-aggregator vector
       --namespace $NAMESPACE
-      --version 0.23.0
+      --version 0.26.0
       --repo https://helm.vector.dev
       --values superset-vector-aggregator-values.yaml
 ---

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -6,14 +6,12 @@
 dimensions:
   - name: superset
     values:
-      - 1.3.2
-      - 1.4.2
-      - 1.5.3
-      - 2.0.1
       - 2.1.0
+      - 2.1.1
+      - 3.0.1
   - name: superset-latest
     values:
-      - 2.1.0
+      - 3.0.1
   - name: ldap-authentication
     values:
       - no-tls