From eff35b5b321d711ecaffc0d03e9ce03ca6daaf07 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 2 Oct 2025 16:22:03 +0200 Subject: [PATCH 1/2] bump to 2.6.3 --- .../examples/getting_started/getting_started.sh | 2 +- .../getting_started/getting_started.sh.j2 | 2 +- .../hbase/examples/getting_started/hbase.yaml | 2 +- .../hbase/examples/getting_started/hbase.yaml.j2 | 2 +- .../hbase/examples/getting_started/hdfs.yaml | 2 +- .../hbase/examples/getting_started/hdfs.yaml.j2 | 2 +- .../hbase/examples/usage-guide/hbck2-job.yaml | 2 +- .../hbase/examples/usage-guide/hbck2-job.yaml.j2 | 2 +- .../usage-guide/snapshot-export-job.yaml | 2 +- .../usage-guide/snapshot-export-job.yaml.j2 | 2 +- .../hbase/pages/getting_started/first_steps.adoc | 2 +- .../hbase/partials/supported-versions.adoc | 4 ++-- rust/operator-binary/src/config/jvm.rs | 4 ++-- rust/operator-binary/src/crd/affinity.rs | 2 +- rust/operator-binary/src/crd/mod.rs | 6 +++--- rust/operator-binary/src/hbase_controller.rs | 6 +++--- tests/test-definition.yaml | 16 ++++++++-------- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/modules/hbase/examples/getting_started/getting_started.sh b/docs/modules/hbase/examples/getting_started/getting_started.sh index f4282b4e..0c3b25d9 100755 --- a/docs/modules/hbase/examples/getting_started/getting_started.sh +++ b/docs/modules/hbase/examples/getting_started/getting_started.sh @@ -129,7 +129,7 @@ version() { echo "Check cluster version..." cluster_version=$(version | jq -r '.Version') -if [ "$cluster_version" == "2.6.2-stackable0.0.0-dev" ]; then +if [ "$cluster_version" == "2.6.3-stackable0.0.0-dev" ]; then echo "Cluster version: $cluster_version" else echo "Unexpected version: $cluster_version" diff --git a/docs/modules/hbase/examples/getting_started/getting_started.sh.j2 b/docs/modules/hbase/examples/getting_started/getting_started.sh.j2 index d53e4872..f61ef51f 100755 --- a/docs/modules/hbase/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/hbase/examples/getting_started/getting_started.sh.j2 @@ -129,7 +129,7 @@ version() { echo "Check cluster version..." cluster_version=$(version | jq -r '.Version') -if [ "$cluster_version" == "2.6.2-stackable0.0.0-dev" ]; then +if [ "$cluster_version" == "2.6.3-stackable0.0.0-dev" ]; then echo "Cluster version: $cluster_version" else echo "Unexpected version: $cluster_version" diff --git a/docs/modules/hbase/examples/getting_started/hbase.yaml b/docs/modules/hbase/examples/getting_started/hbase.yaml index 51cbaf25..4934b561 100644 --- a/docs/modules/hbase/examples/getting_started/hbase.yaml +++ b/docs/modules/hbase/examples/getting_started/hbase.yaml @@ -5,7 +5,7 @@ metadata: name: simple-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-hbase-znode diff --git a/docs/modules/hbase/examples/getting_started/hbase.yaml.j2 b/docs/modules/hbase/examples/getting_started/hbase.yaml.j2 index 51cbaf25..4934b561 100644 --- a/docs/modules/hbase/examples/getting_started/hbase.yaml.j2 +++ b/docs/modules/hbase/examples/getting_started/hbase.yaml.j2 @@ -5,7 +5,7 @@ metadata: name: simple-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-hbase-znode diff --git a/docs/modules/hbase/examples/getting_started/hdfs.yaml b/docs/modules/hbase/examples/getting_started/hdfs.yaml index c36f4a3d..a4ed7c13 100644 --- a/docs/modules/hbase/examples/getting_started/hdfs.yaml +++ b/docs/modules/hbase/examples/getting_started/hdfs.yaml @@ -5,7 +5,7 @@ metadata: name: simple-hdfs spec: image: - productVersion: 3.4.1 + productVersion: 3.4.2 clusterConfig: dfsReplication: 1 zookeeperConfigMapName: simple-hdfs-znode diff --git a/docs/modules/hbase/examples/getting_started/hdfs.yaml.j2 b/docs/modules/hbase/examples/getting_started/hdfs.yaml.j2 index c36f4a3d..a4ed7c13 100644 --- a/docs/modules/hbase/examples/getting_started/hdfs.yaml.j2 +++ b/docs/modules/hbase/examples/getting_started/hdfs.yaml.j2 @@ -5,7 +5,7 @@ metadata: name: simple-hdfs spec: image: - productVersion: 3.4.1 + productVersion: 3.4.2 clusterConfig: dfsReplication: 1 zookeeperConfigMapName: simple-hdfs-znode diff --git a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml index 3abae00a..7608d0dd 100644 --- a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml +++ b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: hbck2 - image: oci.stackable.tech/sdp/hbase:2.6.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hbase:2.6.3-stackable0.0.0-dev volumeMounts: - name: hbase-config mountPath: /stackable/conf diff --git a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2 b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2 index bbfff969..f038cffc 100644 --- a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2 +++ b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2 @@ -8,7 +8,7 @@ spec: spec: containers: - name: hbck2 - image: oci.stackable.tech/sdp/hbase:2.6.2-stackable{{ versions.hbase }} + image: oci.stackable.tech/sdp/hbase:2.6.3-stackable{{ versions.hbase }} volumeMounts: - name: hbase-config mountPath: /stackable/conf diff --git a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml index 9db3626b..c1144cb6 100644 --- a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml +++ b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: hbase - image: oci.stackable.tech/sdp/hbase:2.6.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hbase:2.6.3-stackable0.0.0-dev volumeMounts: - name: hbase-config mountPath: /stackable/conf diff --git a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2 b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2 index 03877a9d..847f62b2 100644 --- a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2 +++ b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2 @@ -8,7 +8,7 @@ spec: spec: containers: - name: hbase - image: oci.stackable.tech/sdp/hbase:2.6.2-stackable{{ versions.hbase }} + image: oci.stackable.tech/sdp/hbase:2.6.3-stackable{{ versions.hbase }} volumeMounts: - name: hbase-config mountPath: /stackable/conf diff --git a/docs/modules/hbase/pages/getting_started/first_steps.adoc b/docs/modules/hbase/pages/getting_started/first_steps.adoc index 6640996d..36d90418 100644 --- a/docs/modules/hbase/pages/getting_started/first_steps.adoc +++ b/docs/modules/hbase/pages/getting_started/first_steps.adoc @@ -85,7 +85,7 @@ include::example$getting_started/getting_started.sh[tag=cluster-version] This returns the version that was specified in the HBase cluster definition: [source,json] -{"Version":"2.6.2"} +{"Version":"2.6.3"} The cluster status can be checked and formatted like this: diff --git a/docs/modules/hbase/partials/supported-versions.adoc b/docs/modules/hbase/partials/supported-versions.adoc index 6c635205..3352800e 100644 --- a/docs/modules/hbase/partials/supported-versions.adoc +++ b/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.2 (LTS) -- 2.6.1 (Deprecated) +- 2.6.3 (LTS) +- 2.6.2 (Deprecated) diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs index effd6792..dc340cdf 100644 --- a/rust/operator-binary/src/config/jvm.rs +++ b/rust/operator-binary/src/config/jvm.rs @@ -147,7 +147,7 @@ mod tests { name: simple-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-znode @@ -184,7 +184,7 @@ mod tests { name: simple-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-znode diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs index aa0cb11e..ece35e86 100644 --- a/rust/operator-binary/src/crd/affinity.rs +++ b/rust/operator-binary/src/crd/affinity.rs @@ -105,7 +105,7 @@ mod tests { name: simple-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-znode diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index a57e1faa..4a67187a 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -1311,7 +1311,7 @@ metadata: name: test-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: test-hdfs zookeeperConfigMapName: test-znode @@ -1359,7 +1359,7 @@ spec: )]); let validated_config = validate_all_roles_and_groups_config( - "2.6.2", + "2.6.3", &transform_all_roles_to_config(&hbase, roles).unwrap(), &ProductConfigManager::from_yaml_file("../../deploy/config-spec/properties.yaml") .unwrap(), @@ -1412,7 +1412,7 @@ metadata: name: test-hbase spec: image: - productVersion: 2.6.2 + productVersion: 2.6.3 clusterConfig: hdfsConfigMapName: test-hdfs zookeeperConfigMapName: test-znode diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs index ec42e18b..8054c6ff 100644 --- a/rust/operator-binary/src/hbase_controller.rs +++ b/rust/operator-binary/src/hbase_controller.rs @@ -1210,12 +1210,12 @@ mod test { use super::*; #[rstest] - #[case("2.6.1", HbaseRole::Master, vec!["master", "ui-http"])] - #[case("2.6.1", HbaseRole::RegionServer, vec!["regionserver", "ui-http"])] - #[case("2.6.1", HbaseRole::RestServer, vec!["rest-http", "ui-http"])] #[case("2.6.2", HbaseRole::Master, vec!["master", "ui-http"])] #[case("2.6.2", HbaseRole::RegionServer, vec!["regionserver", "ui-http"])] #[case("2.6.2", HbaseRole::RestServer, vec!["rest-http", "ui-http"])] + #[case("2.6.3", HbaseRole::Master, vec!["master", "ui-http"])] + #[case("2.6.3", HbaseRole::RegionServer, vec!["regionserver", "ui-http"])] + #[case("2.6.3", HbaseRole::RestServer, vec!["rest-http", "ui-http"])] fn test_rolegroup_service_ports( #[case] hbase_version: &str, #[case] role: HbaseRole, diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index fa7ada32..961bac92 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -2,25 +2,25 @@ dimensions: - name: hbase values: - - 2.6.1 - 2.6.2 + - 2.6.3 # To use a custom image, add a comma and the full name after the product version - # - 2.6.2,oci.stackable.tech/sandbox/hbase:2.6.2-stackable0.0.0-dev + # - 2.6.3,oci.stackable.tech/sandbox/hbase:2.6.3-stackable0.0.0-dev - name: hbase-opa values: - - 2.6.2 + - 2.6.3 # To use a custom image, add a comma and the full name after the product version - # - 2.6.2,oci.stackable.tech/sandbox/hbase:2.6.2-stackable0.0.0-dev + # - 2.6.3,oci.stackable.tech/sandbox/hbase:2.6.3-stackable0.0.0-dev - name: hbase-latest values: - - 2.6.2 - # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev + - 2.6.3 + # - 2.6.3,oci.stackable.tech/sandbox/hbase:2.6.3-stackable0.0.0-dev - name: hdfs values: - - 3.4.1 + - 3.4.2 - name: hdfs-latest values: - - 3.4.1 + - 3.4.2 - name: zookeeper values: - 3.9.3 From 564bbe617863ae71dff81e9f7a9adf15ce60530f Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 2 Oct 2025 16:36:16 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e638ed34..7884243b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - Helm: Allow Pod `priorityClassName` to be configured ([#691]). +- Added support for HBase 2.6.3 ([#695]). [#691]: https://github.com/stackabletech/hbase-operator/pull/691 @@ -19,7 +20,7 @@ - Use `--file-log-max-files` (or `FILE_LOG_MAX_FILES`) to limit the number of log files kept. - Use `--file-log-rotation-period` (or `FILE_LOG_ROTATION_PERIOD`) to configure the frequency of rotation. - Use `--console-log-format` (or `CONSOLE_LOG_FORMAT`) to set the format to `plain` (default) or `json`. -- Added support for HBase 2.6.2 ([#659]): +- Added support for HBase 2.6.2 ([#659]). - Add RBAC rule to helm template for automatic cluster domain detection ([#675]). ### Changed @@ -75,6 +76,7 @@ [#672]: https://github.com/stackabletech/hbase-operator/pull/672 [#675]: https://github.com/stackabletech/hbase-operator/pull/675 [#678]: https://github.com/stackabletech/hbase-operator/pull/678 +[#695]: https://github.com/stackabletech/hbase-operator/pull/695 ## [25.3.0] - 2025-03-21