Skip to content

Commit 4309b9d

Browse files
committed
fix some tests inline with 2.6.1, add UI port type
1 parent 6c616a1 commit 4309b9d

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

rust/operator-binary/src/hbase_controller.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ fn build_rolegroup_statefulset(
897897
.image_from_product_image(resolved_product_image)
898898
.command(command())
899899
.args(vec![formatdoc! {"
900-
{entrypoint} {role} {domain} {port} {port_name}",
900+
{entrypoint} {role} {domain} {port} {port_name} {ui_port_name}",
901901
entrypoint = "/stackable/hbase/bin/hbase-entrypoint.sh".to_string(),
902902
role = role_name,
903903
domain = hbase_service_domain_name(hbase, rolegroup_ref, cluster_info)?,
@@ -906,7 +906,8 @@ fn build_rolegroup_statefulset(
906906
HbaseRole::Master => "master",
907907
HbaseRole::RegionServer => "regionserver",
908908
HbaseRole::RestServer => rest_http_port_name,
909-
}
909+
},
910+
ui_port_name = hbase.ui_port_name(),
910911
}])
911912
.add_env_vars(merged_env)
912913
// Needed for the `containerdebug` process to log it's tracing information to.

tests/templates/kuttl/kerberos/42-test-rest-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
- /bin/bash
1515
- -c
1616
- |
17-
status_code=$(curl --write-out '%{http_code}' --silent --insecure --output /dev/null "https://hbase-restserver-default:8080")
17+
status_code=$(curl --write-out '%{http_code}' --silent --insecure --output /dev/null "https://hbase-restserver-default-metrics:8080")
1818
1919
if [[ "$status_code" -eq 401 ]] ; then
2020
echo "[PASS] Successfully got 401 as we did not authenticate"

tests/templates/kuttl/profiling/run-profiler.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
def start_profiling_and_get_refresh_header(service_url):
1010
prof_page = requests.get(
11-
f"{service_url}/prof"
12-
f"?event={EVENT_TYPE}&duration={PROFILING_DURATION_IN_SEC}"
11+
f"{service_url}/prof?event={EVENT_TYPE}&duration={PROFILING_DURATION_IN_SEC}"
1312
)
1413

1514
assert prof_page.ok, f"""Profiling could not be started.
@@ -56,9 +55,7 @@ def fetch_flamegraph(service_url, refresh_path):
5655

5756

5857
def test_profiling(role, port):
59-
service_url = (
60-
f"http://test-hbase-{role}-default-0.test-hbase-{role}-default" f":{port}"
61-
)
58+
service_url = f"http://test-hbase-{role}-default-metrics:{port}"
6259

6360
print(f"Test profiling on {service_url}")
6461

tests/templates/kuttl/smoke/50-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ kind: TestAssert
44
metadata:
55
name: test-hbase
66
commands:
7-
- script: kubectl exec --namespace=$NAMESPACE hbase-test-runner-0 -- python /tmp/test-hbase.py http://test-hbase-restserver-default:8080
7+
- script: kubectl exec --namespace=$NAMESPACE hbase-test-runner-0 -- python /tmp/test-hbase.py http://test-hbase-restserver-default-metrics:8080
88
timeout: 240

0 commit comments

Comments
 (0)