Skip to content

fix: update documentation and test to use 2.6.1 #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

fix: update documentation and test to use 2.6.1 #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/modules/hbase/examples/getting_started/getting_started.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ version() {
echo "Check cluster version..."
cluster_version=$(version | jq -r '.Version')

if [ "$cluster_version" == "2.4.18" ]; then
if [ "$cluster_version" == "2.6.1" ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is unexpected is this check really. I wonder why it's there.

echo "Cluster version: $cluster_version"
else
echo "Unexpected version: $cluster_version"
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/hbase/examples/getting_started/getting_started.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ version() {
echo "Check cluster version..."
cluster_version=$(version | jq -r '.Version')

if [ "$cluster_version" == "2.4.18" ]; then
if [ "$cluster_version" == "2.6.1" ]; then
echo "Cluster version: $cluster_version"
else
echo "Unexpected version: $cluster_version"
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/hbase/examples/getting_started/hbase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: simple-hbase
spec:
image:
productVersion: 2.4.18
productVersion: 2.6.1
clusterConfig:
hdfsConfigMapName: simple-hdfs
zookeeperConfigMapName: simple-hbase-znode
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/hbase/examples/getting_started/hbase.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: simple-hbase
spec:
image:
productVersion: 2.4.18
productVersion: 2.6.1
clusterConfig:
hdfsConfigMapName: simple-hdfs
zookeeperConfigMapName: simple-hbase-znode
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/hbase/examples/usage-guide/hbck2-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: hbck2
image: oci.stackable.tech/sdp/hbase:2.4.18-stackable0.0.0-dev
image: oci.stackable.tech/sdp/hbase:2.6.1-stackable0.0.0-dev
volumeMounts:
- name: hbase-config
mountPath: /stackable/conf
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: hbck2
image: oci.stackable.tech/sdp/hbase:2.4.18-stackable{{ versions.hbase }}
image: oci.stackable.tech/sdp/hbase:2.6.1-stackable{{ versions.hbase }}
volumeMounts:
- name: hbase-config
mountPath: /stackable/conf
Expand Down
3 changes: 2 additions & 1 deletion docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: hbase
image: oci.stackable.tech/sdp/hbase:2.4.18-stackable0.0.0-dev
image: oci.stackable.tech/sdp/hbase:2.6.1-stackable0.0.0-dev
volumeMounts:
- name: hbase-config
mountPath: /stackable/conf
Expand Down Expand Up @@ -40,6 +40,7 @@ spec:
- my-snapshot
- --copy-to
- s3a://hbase/my-snapshot
- --no-checksum-verify
volumes:
- name: hbase-config
projected:
Expand Down
3 changes: 2 additions & 1 deletion docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: hbase
image: oci.stackable.tech/sdp/hbase:2.4.18-stackable{{ versions.hbase }}
image: oci.stackable.tech/sdp/hbase:2.6.1-stackable{{ versions.hbase }}
volumeMounts:
- name: hbase-config
mountPath: /stackable/conf
Expand Down Expand Up @@ -40,6 +40,7 @@ spec:
- my-snapshot
- --copy-to
- s3a://hbase/my-snapshot
- --no-checksum-verify
volumes:
- name: hbase-config
projected:
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/hbase/pages/getting_started/first_steps.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.18"}
{"Version":"2.6.1"}

The cluster status can be checked and formatted like this:

Expand Down
2 changes: 2 additions & 0 deletions docs/modules/hbase/pages/usage-guide/snapshot-export.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ $ export \
AWS_SSL_ENABLED=true \
AWS_PATH_STYLE_ACCESS=true
$ export-snapshot-to-s3 \
--no-checksum-verify \
--snapshot my-snapshot \
--copy-to s3a://my-bucket/my-snapshot
----
Expand All @@ -42,6 +43,7 @@ Snapshots can also be imported from S3 into HDFS:
[source,shell]
----
$ export-snapshot-to-s3 \
--no-checksum-verify \
--snapshot snap \
--copy-from s3a://my-bucket/my-snapshot \
--copy-to hdfs://simple-hdfs/hbase
Expand Down
2 changes: 1 addition & 1 deletion rust/crd/src/affinity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ mod tests {
name: simple-hbase
spec:
image:
productVersion: 2.4.18
productVersion: 2.6.1
clusterConfig:
hdfsConfigMapName: simple-hdfs
zookeeperConfigMapName: simple-znode
Expand Down
6 changes: 3 additions & 3 deletions rust/crd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ metadata:
name: test-hbase
spec:
image:
productVersion: 2.4.18
productVersion: 2.6.1
clusterConfig:
hdfsConfigMapName: test-hdfs
zookeeperConfigMapName: test-znode
Expand Down Expand Up @@ -1310,7 +1310,7 @@ spec:
)]);

let validated_config = validate_all_roles_and_groups_config(
"2.4.18",
"2.6.1",
&transform_all_roles_to_config(&hbase, roles).unwrap(),
&ProductConfigManager::from_yaml_file("../../deploy/config-spec/properties.yaml")
.unwrap(),
Expand Down Expand Up @@ -1363,7 +1363,7 @@ metadata:
name: test-hbase
spec:
image:
productVersion: 2.4.18
productVersion: 2.6.1
clusterConfig:
hdfsConfigMapName: test-hdfs
zookeeperConfigMapName: test-znode
Expand Down
3 changes: 1 addition & 2 deletions rust/operator-binary/src/config/jvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ mod tests {
name: simple-hbase
spec:
image:
productVersion: 2.4.18
productVersion: 2.6.1
clusterConfig:
hdfsConfigMapName: simple-hdfs
zookeeperConfigMapName: simple-znode
Expand Down Expand Up @@ -250,7 +250,6 @@ mod tests {
assert_eq!(
role_specific_non_heap_jvm_args,
"-Djava.security.properties=/stackable/conf/security.properties \
-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=9100:/stackable/jmx/regionserver.yaml \
-Djava.security.krb5.conf=/stackable/kerberos/krb5.conf \
-Dhttps.proxyHost=proxy.my.corp \
-Djava.net.preferIPv4Stack=true \
Expand Down
6 changes: 3 additions & 3 deletions rust/operator-binary/src/hbase_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,9 +1199,9 @@ mod test {
use super::*;

#[rstest]
#[case("2.6.0", HbaseRole::Master, vec!["master", "ui-http"])]
#[case("2.6.0", HbaseRole::RegionServer, vec!["regionserver", "ui-http"])]
#[case("2.6.0", HbaseRole::RestServer, vec!["rest-http", "ui-http"])]
#[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"])]
Expand Down
Loading