Skip to content

Commit 3238cd1

Browse files
maltesandersbernauer
maltesander
and
sbernauer
authored
fix: Revert/remove headless suffix from headless service (#726)
* revert/remove headless suffix from headless service * changelog * python linter --------- Co-authored-by: Sebastian Bernauer <[email protected]>
1 parent 671760a commit 3238cd1

File tree

11 files changed

+21
-23
lines changed

11 files changed

+21
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ All notable changes to this project will be documented in this file.
1515

1616
### Changed
1717

18-
- BREAKING: Renamed headless rolegroup service from `<stacklet>-<role>-<rolegroup>` to `<stacklet>-<role>-<rolegroup>-headless` ([#721]).
19-
- The `prometheus.io/scrape` label was moved to the metrics service
20-
- The headless service now only exposes product / data ports, the metrics service only metrics ports
18+
- The `prometheus.io/scrape` label was moved to the metrics service ([#721]).
19+
- The headless service now only exposes product / data ports, the metrics service only metrics ports ([#721], [#726]).
2120
- Bump stackable-operator to `0.100.1` and product-config to `0.8.0` ([#722]).
2221

2322
[#713]: https://github.com/stackabletech/hdfs-operator/pull/713
2423
[#718]: https://github.com/stackabletech/hdfs-operator/pull/718
2524
[#721]: https://github.com/stackabletech/hdfs-operator/pull/721
2625
[#722]: https://github.com/stackabletech/hdfs-operator/pull/722
26+
[#726]: https://github.com/stackabletech/hdfs-operator/pull/726
2727

2828
## [25.7.0] - 2025-07-23
2929

‎docs/modules/hdfs/examples/getting_started/getting_started.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ kubectl rollout status --watch --timeout=5m statefulset/webhdfs
116116

117117
file_status() {
118118
# tag::file-status[]
119-
kubectl exec -n default webhdfs-0 -- curl -s -XGET "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default-headless.default.svc.cluster.local:9870/webhdfs/v1/?op=LISTSTATUS"
119+
kubectl exec -n default webhdfs-0 -- curl -s -XGET "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default.default.svc.cluster.local:9870/webhdfs/v1/?op=LISTSTATUS"
120120
# end::file-status[]
121121
}
122122

@@ -138,7 +138,7 @@ kubectl cp -n default ./testdata.txt webhdfs-0:/tmp
138138
create_file() {
139139
# tag::create-file[]
140140
kubectl exec -n default webhdfs-0 -- \
141-
curl -s -XPUT -T /tmp/testdata.txt "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default-headless.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=CREATE&noredirect=true"
141+
curl -s -XPUT -T /tmp/testdata.txt "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=CREATE&noredirect=true"
142142
# end::create-file[]
143143
}
144144

@@ -157,7 +157,7 @@ echo "Created file: $found_file with status $(file_status)"
157157
echo "Delete file"
158158
delete_file() {
159159
# tag::delete-file[]
160-
kubectl exec -n default webhdfs-0 -- curl -s -XDELETE "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default-headless.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=DELETE"
160+
kubectl exec -n default webhdfs-0 -- curl -s -XDELETE "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=DELETE"
161161
# end::delete-file[]
162162
}
163163

‎docs/modules/hdfs/examples/getting_started/getting_started.sh.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ kubectl rollout status --watch --timeout=5m statefulset/webhdfs
116116

117117
file_status() {
118118
# tag::file-status[]
119-
kubectl exec -n default webhdfs-0 -- curl -s -XGET "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default-headless.default.svc.cluster.local:9870/webhdfs/v1/?op=LISTSTATUS"
119+
kubectl exec -n default webhdfs-0 -- curl -s -XGET "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default.default.svc.cluster.local:9870/webhdfs/v1/?op=LISTSTATUS"
120120
# end::file-status[]
121121
}
122122

@@ -138,7 +138,7 @@ kubectl cp -n default ./testdata.txt webhdfs-0:/tmp
138138
create_file() {
139139
# tag::create-file[]
140140
kubectl exec -n default webhdfs-0 -- \
141-
curl -s -XPUT -T /tmp/testdata.txt "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default-headless.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=CREATE&noredirect=true"
141+
curl -s -XPUT -T /tmp/testdata.txt "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=CREATE&noredirect=true"
142142
# end::create-file[]
143143
}
144144

@@ -157,7 +157,7 @@ echo "Created file: $found_file with status $(file_status)"
157157
echo "Delete file"
158158
delete_file() {
159159
# tag::delete-file[]
160-
kubectl exec -n default webhdfs-0 -- curl -s -XDELETE "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default-headless.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=DELETE"
160+
kubectl exec -n default webhdfs-0 -- curl -s -XDELETE "http://simple-hdfs-namenode-default-0.simple-hdfs-namenode-default.default.svc.cluster.local:9870/webhdfs/v1/testdata.txt?user.name=stackable&op=DELETE"
161161
# end::delete-file[]
162162
}
163163

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl v1alpha1::HdfsCluster {
391391
let ns = ns.clone();
392392
(0..*replicas).map(move |i| HdfsPodRef {
393393
namespace: ns.clone(),
394-
role_group_service_name: rolegroup_ref.rolegroup_headless_service_name(),
394+
role_group_service_name: rolegroup_ref.object_name(),
395395
pod_name: format!("{}-{}", rolegroup_ref.object_name(), i),
396396
ports: self
397397
.data_ports(role)

‎rust/operator-binary/src/hdfs_controller.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ fn rolegroup_statefulset(
887887
match_labels: Some(rolegroup_selector_labels.into()),
888888
..LabelSelector::default()
889889
},
890-
service_name: Some(rolegroup_ref.rolegroup_headless_service_name()),
890+
service_name: Some(rolegroup_ref.object_name()),
891891
template: pod_template,
892892

893893
volume_claim_templates: Some(pvcs),

‎rust/operator-binary/src/service.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub(crate) fn rolegroup_headless_service(
4848
let mut metadata_builder = ObjectMetaBuilder::new();
4949
metadata_builder
5050
.name_and_namespace(hdfs)
51-
.name(rolegroup_ref.rolegroup_headless_service_name())
51+
.name(rolegroup_ref.object_name())
5252
.ownerreference_from_resource(hdfs, None, Some(true))
5353
.with_context(|_| ObjectMissingMetadataForOwnerRefSnafu {
5454
obj_ref: ObjectRef::from_obj(hdfs),

‎tests/templates/kuttl/orphaned-resources/04-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ metadata:
2121
apiVersion: v1
2222
kind: Service
2323
metadata:
24-
name: test-hdfs-datanode-newrolegroup-headless
24+
name: test-hdfs-datanode-newrolegroup

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ def fetch_flamegraph(service_url, refresh_path):
5454

5555

5656
def test_profiling(role, port):
57-
service_url = (
58-
f"http://test-hdfs-{role}-default-0.test-hdfs-{role}-default-headless:{port}"
59-
)
57+
service_url = f"http://test-hdfs-{role}-default-0.test-hdfs-{role}-default:{port}"
6058

6159
print(f"Test profiling on {service_url}")
6260

‎tests/templates/kuttl/smoke/30-assert.yaml.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ status:
8080
apiVersion: v1
8181
kind: Service
8282
metadata:
83-
name: hdfs-namenode-default-headless
83+
name: hdfs-namenode-default
8484
spec:
8585
ports:
8686
- name: rpc
@@ -110,7 +110,7 @@ spec:
110110
apiVersion: v1
111111
kind: Service
112112
metadata:
113-
name: hdfs-datanode-default-headless
113+
name: hdfs-datanode-default
114114
spec:
115115
ports:
116116
- name: data
@@ -144,7 +144,7 @@ spec:
144144
apiVersion: v1
145145
kind: Service
146146
metadata:
147-
name: hdfs-journalnode-default-headless
147+
name: hdfs-journalnode-default
148148
spec:
149149
ports:
150150
- name: rpc

‎tests/templates/kuttl/smoke/test_jmx_metrics.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ def check_datanode_metrics(
6565
# Kind "FSDatasetState"
6666
'hadoop_datanode_capacity{fsdatasetid=".+",kind="FSDatasetState",role="DataNode",service="HDFS"}',
6767
# Kind "DataNodeActivity" suffixed with "_info"
68-
'hadoop_datanode_blocks_get_local_path_info_{host="hdfs-datanode-default-\\d+\\.hdfs-datanode-default-headless\\..+\\.svc\\.cluster\\.local",kind="DataNodeActivity",port="9866",role="DataNode",service="HDFS"}',
68+
'hadoop_datanode_blocks_get_local_path_info_{host="hdfs-datanode-default-\\d+\\.hdfs-datanode-default\\..+\\.svc\\.cluster\\.local",kind="DataNodeActivity",port="9866",role="DataNode",service="HDFS"}',
6969
# Kind "DataNodeActivity"
70-
'hadoop_datanode_blocks_read{host="hdfs-datanode-default-\\d+\\.hdfs-datanode-default-headless\\..+\\.svc\\.cluster\\.local",kind="DataNodeActivity",port="9866",role="DataNode",service="HDFS"}',
70+
'hadoop_datanode_blocks_read{host="hdfs-datanode-default-\\d+\\.hdfs-datanode-default\\..+\\.svc\\.cluster\\.local",kind="DataNodeActivity",port="9866",role="DataNode",service="HDFS"}',
7171
# Counter suffixed with "_total"
7272
'hadoop_datanode_estimated_capacity_lost_total{kind="FSDatasetState",role="DataNode",service="HDFS"}',
7373
# Boolean metric

0 commit comments

Comments
 (0)