fix merge conflict, fix clippy warning

Author: adwk67

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 
 - BREAKING: Add required CLI argument and env var to set the image repository used to construct final product image names: `IMAGE_REPOSITORY` (`--image-repository`), eg. `oci.example.org/my/namespace` ([#752]).
+- Add support for HBase 2.6.6 (as LTS) ([#767]).
 
 ### Changed
 
@@ -19,12 +20,17 @@
 - BREAKING: Removed product-config machinery. This is a breaking change in terms of configuration.
   Users relying on the product-config `properties.yaml` file have to set these properties via the CRD ([#765]).
 
+### Removed
+
+- Remove support for 2.6.3 ([#767]).
+
 [#745]: https://github.com/stackabletech/hbase-operator/pull/745
 [#751]: https://github.com/stackabletech/hbase-operator/pull/751
 [#752]: https://github.com/stackabletech/hbase-operator/pull/752
 [#757]: https://github.com/stackabletech/hbase-operator/pull/757
 [#762]: https://github.com/stackabletech/hbase-operator/pull/762
 [#765]: https://github.com/stackabletech/hbase-operator/pull/765
+[#767]: https://github.com/stackabletech/hbase-operator/pull/767
 
 ## [26.3.0] - 2026-03-16
 

docs/modules/hbase/examples/getting_started/hbase.yaml

@@ -5,7 +5,7 @@ metadata:
   name: simple-hbase
 spec:
   image:
-    productVersion: 2.6.4
+    productVersion: 2.6.6
   clusterConfig:
     hdfsConfigMapName: simple-hdfs
     zookeeperConfigMapName: simple-hbase-znode

docs/modules/hbase/examples/getting_started/hbase.yaml.j2

@@ -5,7 +5,7 @@ metadata:
   name: simple-hbase
 spec:
   image:
-    productVersion: 2.6.4
+    productVersion: 2.6.6
   clusterConfig:
     hdfsConfigMapName: simple-hdfs
     zookeeperConfigMapName: simple-hbase-znode

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

@@ -2,5 +2,5 @@
 // This is a separate file, since it is used by both the direct HBase-Operator documentation, and the overarching
 // Stackable Platform documentation.
 
-- 2.6.4 (LTS)
-- 2.6.3
+- 2.6.4 (DEPRECATED)
+- 2.6.6 (LTS)

rust/operator-binary/src/controller/validate.rs

@@ -226,7 +226,7 @@ pub fn validate_cluster(
 /// Validates every role group of a role into a map keyed by role group name.
 ///
 /// Each role group is merged and validated via
-/// [`with_validated_config`](stackable_operator::v2::role_utils::with_validated_config),
+/// [`with_validated_config`],
 /// which folds the CRD config fragment (default <- role <- role group) plus the
 /// `configOverrides`, `envOverrides`, `cliOverrides`, `podOverrides` and the
 /// `jvmArgumentOverrides` (role group wins) into a single merged

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

@@ -637,7 +637,7 @@ metadata:
   uid: 12345678-1234-1234-1234-123456789012
 spec:
   image:
-    productVersion: 2.6.4
+    productVersion: 2.6.6
   clusterConfig:
     hdfsConfigMapName: test-hdfs
     zookeeperConfigMapName: test-znode
@@ -693,7 +693,7 @@ spec:
         fn roundtrip_test_data() -> Vec<Self> {
             stackable_operator::utils::yaml_from_str_singleton_map(indoc::indoc! {r#"
               - image:
-                  productVersion: 2.6.4
+                  productVersion: 2.6.6
                   pullPolicy: IfNotPresent
                 clusterOperation:
                   reconciliationPaused: false

tests/test-definition.yaml

@@ -2,18 +2,19 @@
 dimensions:
   - name: hbase
     values:
-      - 2.6.3
       - 2.6.4
+      - 2.6.6
       # To use a custom image, add a comma and the full name after the product version
       # - x.x.x,oci.stackable.tech/sandbox/hbase:x.x.x-stackable0.0.0-dev
   - name: hbase-opa
     values:
       - 2.6.4
+      - 2.6.6
       # To use a custom image, add a comma and the full name after the product version
       # - x.x.x,oci.stackable.tech/sandbox/hbase:x.x.x-stackable0.0.0-dev
   - name: hbase-latest
     values:
-      - 2.6.4
+      - 2.6.6
       # - x.x.x,oci.stackable.tech/sandbox/hbase:x.x.x-stackable0.0.0-dev
   - name: hdfs
     values: