Merge branch 'main' into feat/smooth-operator/remove-product-config

Author: maltesander

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:6.0.0-stackable0.0.0-dev
+        image: oci.stackable.tech/sdp/superset:6.1.0-stackable0.0.0-dev
         command: [
           "/bin/bash",
           "-c",

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:6.0.0-stackable{{ versions.superset }}
+        image: oci.stackable.tech/sdp/superset:6.1.0-stackable{{ versions.superset }}
         command: [
           "/bin/bash",
           "-c",

docs/modules/superset/examples/getting_started/superset.yaml

@@ -13,7 +13,7 @@ metadata:
   name: simple-superset
 spec:
   image:
-    productVersion: 6.0.0
+    productVersion: 6.1.0
   clusterConfig:
     credentialsSecretName: superset-admin-credentials
     metadataDatabase:

docs/modules/superset/pages/usage-guide/security.adoc

@@ -34,7 +34,7 @@ metadata:
   name: superset-with-ldap-server
 spec:
   image:
-    productVersion: 6.0.0
+    productVersion: 6.1.0
   clusterConfig:
     authentication:
     - authenticationClass: ldap    # <1>
@@ -64,7 +64,7 @@ metadata:
   name: superset-with-oidc
 spec:
   image:
-    productVersion: 6.0.0
+    productVersion: 6.1.0
   clusterConfig:
     authentication:
     - authenticationClass: keycloak                        # <1>
@@ -229,7 +229,7 @@ metadata:
   name: superset-with-oidc
 spec:
   image:
-    productVersion: 6.0.0
+    productVersion: 6.1.0
   clusterConfig:
     authentication:
     - authenticationClass: keycloak

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

@@ -2,5 +2,6 @@
 // This is a separate file, since it is used by both the direct Superset documentation, and the overarching
 // Stackable Platform documentation.
 
-- 6.0.0
+- 6.1.0
+- 6.0.0 (deprecated)
 - 4.1.4 (LTS)

rust/operator-binary/src/crd/affinity.rs

@@ -46,7 +46,7 @@ mod tests {
           name: simple-superset
         spec:
           image:
-            productVersion: 4.1.4
+            productVersion: 6.1.0
           clusterConfig:
             credentialsSecretName: superset-admin-credentials
             metadataDatabase:

tests/templates/kuttl/upgrade/00-limit-range.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: LimitRange
+metadata:
+  name: limit-request-ratio
+spec:
+  limits:
+  - type: "Container"
+    maxLimitRequestRatio:
+      cpu: 5
+      memory: 1

tests/templates/kuttl/upgrade/00-patch-ns.yaml.j2

@@ -0,0 +1,9 @@
+{% if test_scenario['values']['openshift'] == 'true' %}
+# see https://github.com/stackabletech/issues/issues/566
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: kubectl patch namespace $NAMESPACE -p '{"metadata":{"labels":{"pod-security.kubernetes.io/enforce":"privileged"}}}'
+    timeout: 120
+{% endif %}

tests/templates/kuttl/upgrade/10-assert.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+metadata:
+  name: test-superset-postgresql
+timeout: 480
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: superset-postgresql
+status:
+  readyReplicas: 1
+  replicas: 1

tests/templates/kuttl/upgrade/10-install-postgresql.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: >-
+      helm install superset-postgresql
+      --namespace $NAMESPACE
+      --version 12.5.6
+      -f 10_helm-bitnami-postgresql-values.yaml
+      --repo https://charts.bitnami.com/bitnami postgresql
+      --wait
+    timeout: 600