diff --git a/CHANGELOG.md b/CHANGELOG.md index a1f620ef..834b5030 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,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]): ### Changed @@ -35,6 +36,7 @@ - test: ZooKeeper 3.9.2 removed ([#654]). - test: Remove HDFS `3.3.4`, `3.3.6`, and `3.4.0` ([#655]). +- test: HBase 2.4.18 removed ([#659]): [#640]: https://github.com/stackabletech/hbase-operator/pull/640 [#645]: https://github.com/stackabletech/hbase-operator/pull/645 @@ -44,6 +46,7 @@ [#654]: https://github.com/stackabletech/hbase-operator/pull/654 [#655]: https://github.com/stackabletech/hbase-operator/pull/655 [#657]: https://github.com/stackabletech/hbase-operator/pull/657 +[#659]: https://github.com/stackabletech/hbase-operator/pull/659 [#660]: https://github.com/stackabletech/hbase-operator/pull/660 [#661]: https://github.com/stackabletech/hbase-operator/pull/661 diff --git a/docs/modules/hbase/examples/getting_started/getting_started.sh b/docs/modules/hbase/examples/getting_started/getting_started.sh index b0ea6b16..198376c6 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.1" ]; then +if [ "$cluster_version" == "2.6.2" ]; 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 7f474d2c..4149a9f8 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.1" ]; then +if [ "$cluster_version" == "2.6.2" ]; 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 f98842f5..51cbaf25 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.1 + productVersion: 2.6.2 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 f98842f5..51cbaf25 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.1 + productVersion: 2.6.2 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-hbase-znode diff --git a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml index b67ef8e4..3abae00a 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.1-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hbase:2.6.2-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 3bbc73fc..bbfff969 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.1-stackable{{ versions.hbase }} + image: oci.stackable.tech/sdp/hbase:2.6.2-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 9e9ef524..9db3626b 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.1-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hbase:2.6.2-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 16ed8a2a..03877a9d 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.1-stackable{{ versions.hbase }} + image: oci.stackable.tech/sdp/hbase:2.6.2-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 21a75628..ce3d7af0 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.1"} +{"Version":"2.6.2"} 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 ca33eed1..1b349117 100644 --- a/docs/modules/hbase/partials/supported-versions.adoc +++ b/docs/modules/hbase/partials/supported-versions.adoc @@ -3,4 +3,4 @@ // Stackable Platform documentation. - 2.6.1 (LTS) -- 2.4.18 (Deprecated) +- 2.6.2 diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs index 95b2c9de..4737ecc4 100644 --- a/rust/operator-binary/src/config/jvm.rs +++ b/rust/operator-binary/src/config/jvm.rs @@ -155,7 +155,7 @@ mod tests { name: simple-hbase spec: image: - productVersion: 2.6.1 + productVersion: 2.6.2 clusterConfig: hdfsConfigMapName: simple-hdfs zookeeperConfigMapName: simple-znode @@ -198,7 +198,7 @@ mod tests { name: simple-hbase spec: image: - productVersion: 2.6.1 + productVersion: 2.6.2 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 3c079faf..27a1c2d2 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.1 + productVersion: 2.6.2 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 e13e3a2c..dd878acf 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -1264,7 +1264,7 @@ metadata: name: test-hbase spec: image: - productVersion: 2.6.1 + productVersion: 2.6.2 clusterConfig: hdfsConfigMapName: test-hdfs zookeeperConfigMapName: test-znode @@ -1312,7 +1312,7 @@ spec: )]); let validated_config = validate_all_roles_and_groups_config( - "2.6.1", + "2.6.2", &transform_all_roles_to_config(&hbase, roles).unwrap(), &ProductConfigManager::from_yaml_file("../../deploy/config-spec/properties.yaml") .unwrap(), @@ -1365,7 +1365,7 @@ metadata: name: test-hbase spec: image: - productVersion: 2.6.1 + productVersion: 2.6.2 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 14081a66..b16afb34 100644 --- a/rust/operator-binary/src/hbase_controller.rs +++ b/rust/operator-binary/src/hbase_controller.rs @@ -1191,9 +1191,9 @@ mod test { #[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.4.14", HbaseRole::Master, vec!["master", "ui-http", "metrics"])] - #[case("2.4.14", HbaseRole::RegionServer, vec!["regionserver", "ui-http", "metrics"])] - #[case("2.4.14", HbaseRole::RestServer, vec!["rest-http", "ui-http", "metrics"])] + #[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"])] fn test_rolegroup_service_ports( #[case] hbase_version: &str, #[case] role: HbaseRole, diff --git a/tests/templates/kuttl/snapshot-export/30_test-export.sh b/tests/templates/kuttl/snapshot-export/30_test-export.sh index 647ebc09..dd622091 100755 --- a/tests/templates/kuttl/snapshot-export/30_test-export.sh +++ b/tests/templates/kuttl/snapshot-export/30_test-export.sh @@ -1,9 +1,13 @@ #!/usr/bin/env bash +# shellcheck disable=SC2034 set -euxo pipefail export \ AWS_ACCESS_KEY_ID=hbaseAccessKey \ + # Used by AWS bundle 1.12.367 via Hadoop 3.3.6 AWS_SECRET_KEY=hbaseSecretKey \ + # Used by AWS bundle 2.24.6 via Hadoop 3.4.1 + AWS_SECRET_ACCESS_KEY=hbaseSecretKey \ AWS_ENDPOINT=http://minio:9000/ \ AWS_SSL_ENABLED=false \ AWS_PATH_STYLE_ACCESS=true diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 1dace3b4..240a53f8 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -2,19 +2,18 @@ dimensions: - name: hbase values: - - 2.4.18 - 2.6.1 + - 2.6.2 # To use a custom image, add a comma and the full name after the product version - # - 2.6.1,oci.stackable.tech/sandbox/hbase:2.6.1-stackable0.0.0-dev - # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev + # - 2.6.2,oci.stackable.tech/sandbox/hbase:2.6.2-stackable0.0.0-dev - name: hbase-opa values: - - 2.6.1 + - 2.6.2 # To use a custom image, add a comma and the full name after the product version - # - 2.6.1,oci.stackable.tech/sandbox/hbase:2.6.1-stackable0.0.0-dev + # - 2.6.2,oci.stackable.tech/sandbox/hbase:2.6.2-stackable0.0.0-dev - name: hbase-latest values: - - 2.6.1 + - 2.6.2 # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev - name: hdfs values: @@ -54,9 +53,9 @@ dimensions: - "false" - name: omid values: - - 1.1.2 + - 1.1.3 # To use a custom image, add a comma and the full name after the product version - # - 1.1.0,oci.stackable.tech/sandbox/omid:1.1.0-stackable0.0.0-dev + # - 1.1.3,oci.stackable.tech/sandbox/omid:1.1.3-stackable0.0.0-dev tests: - name: smoke dimensions: