stackabletech · maltesander · Dec 13, 2022 · Dec 13, 2022 · Dec 13, 2022 · Dec 13, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - Upgrade to `operator-rs` `0.27.1` ([#347])
 - Do not run init container as root anymore and avoid chmod and chown ([#353])
 - [BREAKING] Use Product image selection instead of version. `spec.version` has been replaced by `spec.image` ([#356])
+- [BREAKING]: Removed tools image from init container and replaced with Druid product image. This means the latest stackable version has to be used in the product image selection ([#358])
 
 ### Removed
 
@@ -29,6 +30,7 @@ All notable changes to this project will be documented in this file.
 [#347]: https://github.com/stackabletech/druid-operator/pull/347
 [#353]: https://github.com/stackabletech/druid-operator/pull/353
 [#356]: https://github.com/stackabletech/druid-operator/pull/356
+[#358]: https://github.com/stackabletech/druid-operator/pull/358
 
 ## [0.8.0] - 2022-11-07
 

diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc
@@ -54,7 +54,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       hdfs:

diff --git a/docs/modules/getting_started/examples/code/druid.yaml b/docs/modules/getting_started/examples/code/druid.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       hdfs:

diff --git a/examples/psql-s3/psql-s3-druid-cluster.yaml b/examples/psql-s3/psql-s3-druid-cluster.yaml
@@ -47,7 +47,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       s3:

diff --git a/examples/psql/psql-hdfs-druid-cluster.yaml b/examples/psql/psql-hdfs-druid-cluster.yaml
@@ -58,7 +58,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       hdfs:

diff --git a/examples/tls/tls-druid-cluster.yaml b/examples/tls/tls-druid-cluster.yaml
@@ -80,7 +80,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     authentication:
       tls:

diff --git a/rust/crd/test/resources/resource_merge/druid_cluster.yaml b/rust/crd/test/resources/resource_merge/druid_cluster.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       hdfs:

diff --git a/rust/crd/test/resources/resource_merge/segment_cache.yaml b/rust/crd/test/resources/resource_merge/segment_cache.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       hdfs:

diff --git a/rust/crd/test/resources/role_service/druid_cluster.yaml b/rust/crd/test/resources/role_service/druid_cluster.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       hdfs:

diff --git a/rust/operator-binary/src/druid_controller.rs b/rust/operator-binary/src/druid_controller.rs
@@ -653,10 +653,9 @@ fn build_rolegroup_statefulset(
     let prepare_container_command = tls_settings.build_tls_key_stores_cmd();
 
     cb_prepare
-        .image("docker.stackable.tech/stackable/tools:0.2.0-stackable0")
+        .image_from_product_image(resolved_product_image)
         .command(vec!["/bin/bash".to_string(), "-c".to_string()])
         .args(vec![prepare_container_command.join(" && ")])
-        .image_pull_policy("IfNotPresent")
         .build();
 
     // rest of env

diff --git a/rust/operator-binary/test/resources/druid_controller/segment_cache.yaml b/rust/operator-binary/test/resources/druid_controller/segment_cache.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   image:
     productVersion: 24.0.0
-    stackableVersion: 0.2.0
+    stackableVersion: 0.3.0
   clusterConfig:
     deepStorage:
       s3:

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -2,8 +2,8 @@
 dimensions:
   - name: druid
     values:
-      - 0.23.0-stackable0.2.0
-      - 24.0.0-stackable0.2.0
+      - 0.23.0-stackable0.3.0
+      - 24.0.0-stackable0.3.0
   - name: zookeeper
     values:
       - 3.7.0-stackable0.8.0