From de1b7723bce41e4ac7ecb72b8e68d4d5d3990934 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Tue, 10 Nov 2026 08:01:08 +0100
Subject: [PATCH 1/3] test(smoke): Apply Secret before HiveCluster to prevent a
 second ControllerRevision

---
 .../kuttl/smoke/60-install-hive.yaml.j2        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2 b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
index 05ef47b1..dec6e398 100644
--- a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
+++ b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
@@ -1,4 +1,13 @@
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: hive-credentials
+type: Opaque
+stringData:
+  username: hive
+  password: hive
+---
 apiVersion: hive.stackable.tech/v1alpha1
 kind: HiveCluster
 metadata:
@@ -87,12 +96,3 @@ metadata:
 stringData:
   accessKey: hive
   secretKey: hivehive
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: hive
-  password: hive

From e2a8c50ead64e611cb84c1886c9b89448e1c690f Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Tue, 10 Nov 2026 08:49:40 +0100
Subject: [PATCH 2/3] Revert "test(smoke): Apply Secret before HiveCluster to
 prevent a second ControllerRevision"

This reverts commit de1b7723bce41e4ac7ecb72b8e68d4d5d3990934.
---
 .../kuttl/smoke/60-install-hive.yaml.j2        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2 b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
index dec6e398..05ef47b1 100644
--- a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
+++ b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
@@ -1,13 +1,4 @@
 ---
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: hive
-  password: hive
----
 apiVersion: hive.stackable.tech/v1alpha1
 kind: HiveCluster
 metadata:
@@ -96,3 +87,12 @@ metadata:
 stringData:
   accessKey: hive
   secretKey: hivehive
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: hive-credentials
+type: Opaque
+stringData:
+  username: hive
+  password: hive

From a82cc97bf2ec89d3861c6a7d9f9a7ce13408abdb Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Tue, 10 Nov 2026 08:50:35 +0100
Subject: [PATCH 3/3] test(smoke): Move HiveCluster to the end

---
 .../kuttl/smoke/60-install-hive.yaml.j2       | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2 b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
index 05ef47b1..2b1ef1c3 100644
--- a/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
+++ b/tests/templates/kuttl/smoke/60-install-hive.yaml.j2
@@ -1,4 +1,51 @@
 ---
+apiVersion: s3.stackable.tech/v1alpha1
+kind: S3Connection
+metadata:
+  name: minio
+spec:
+  host: minio
+  port: 9000
+  accessStyle: Path
+  credentials:
+    secretClass: test-hive-s3-secret-class
+{% if test_scenario['values']['s3-use-tls'] == 'true' %}
+  tls:
+    verification:
+      server:
+        caCert:
+          secretClass: minio-tls-certificates
+{% endif %}
+---
+apiVersion: secrets.stackable.tech/v1alpha1
+kind: SecretClass
+metadata:
+  name: test-hive-s3-secret-class
+spec:
+  backend:
+    k8sSearch:
+      searchNamespace:
+        pod: {}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-hive-s3-secret
+  labels:
+    secrets.stackable.tech/class: test-hive-s3-secret-class
+stringData:
+  accessKey: hive
+  secretKey: hivehive
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: hive-credentials
+type: Opaque
+stringData:
+  username: hive
+  password: hive
+---
 apiVersion: hive.stackable.tech/v1alpha1
 kind: HiveCluster
 metadata:
@@ -49,50 +96,3 @@ spec:
           hive-site.xml:
             common-var: group-value
             group-var: group-value
----
-apiVersion: s3.stackable.tech/v1alpha1
-kind: S3Connection
-metadata:
-  name: minio
-spec:
-  host: minio
-  port: 9000
-  accessStyle: Path
-  credentials:
-    secretClass: test-hive-s3-secret-class
-{% if test_scenario['values']['s3-use-tls'] == 'true' %}
-  tls:
-    verification:
-      server:
-        caCert:
-          secretClass: minio-tls-certificates
-{% endif %}
----
-apiVersion: secrets.stackable.tech/v1alpha1
-kind: SecretClass
-metadata:
-  name: test-hive-s3-secret-class
-spec:
-  backend:
-    k8sSearch:
-      searchNamespace:
-        pod: {}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: test-hive-s3-secret
-  labels:
-    secrets.stackable.tech/class: test-hive-s3-secret-class
-stringData:
-  accessKey: hive
-  secretKey: hivehive
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: hive-credentials
-type: Opaque
-stringData:
-  username: hive
-  password: hive