Skip to content

Commit 38817d2

Browse files
committed
remove legacy node selector code
1 parent a5be211 commit 38817d2

File tree

2 files changed

+0
-131
lines changed

2 files changed

+0
-131
lines changed

rust/crd/src/affinity.rs

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -219,124 +219,4 @@ mod tests {
219219
}
220220
);
221221
}
222-
223-
#[test]
224-
fn test_affinity_legacy_node_selector() {
225-
let input = r#"
226-
apiVersion: hbase.stackable.tech/v1alpha1
227-
kind: HbaseCluster
228-
metadata:
229-
name: simple-hbase
230-
spec:
231-
image:
232-
productVersion: 2.4.17
233-
clusterConfig:
234-
hdfsConfigMapName: simple-hdfs
235-
zookeeperConfigMapName: simple-znode
236-
masters:
237-
roleGroups:
238-
default:
239-
replicas: 1
240-
selector:
241-
matchLabels:
242-
disktype: ssd
243-
matchExpressions:
244-
- key: topology.kubernetes.io/zone
245-
operator: In
246-
values:
247-
- antarctica-east1
248-
- antarctica-west1
249-
regionServers:
250-
roleGroups:
251-
default:
252-
replicas: 1
253-
restServers:
254-
roleGroups:
255-
default:
256-
replicas: 1
257-
"#;
258-
let hbase: HbaseCluster = serde_yaml::from_str(input).expect("illegal test input");
259-
let merged_config = hbase
260-
.merged_config(
261-
&HbaseRole::Master,
262-
"default",
263-
&hbase.spec.cluster_config.hdfs_config_map_name,
264-
)
265-
.unwrap();
266-
267-
assert_eq!(
268-
merged_config.affinity,
269-
StackableAffinity {
270-
pod_affinity: Some(PodAffinity {
271-
preferred_during_scheduling_ignored_during_execution: Some(vec![
272-
WeightedPodAffinityTerm {
273-
pod_affinity_term: PodAffinityTerm {
274-
label_selector: Some(LabelSelector {
275-
match_expressions: None,
276-
match_labels: Some(BTreeMap::from([
277-
("app.kubernetes.io/name".to_string(), "hbase".to_string(),),
278-
(
279-
"app.kubernetes.io/instance".to_string(),
280-
"simple-hbase".to_string(),
281-
),
282-
]))
283-
}),
284-
namespace_selector: None,
285-
namespaces: None,
286-
topology_key: "kubernetes.io/hostname".to_string(),
287-
},
288-
weight: 20
289-
}
290-
]),
291-
required_during_scheduling_ignored_during_execution: None,
292-
}),
293-
pod_anti_affinity: Some(PodAntiAffinity {
294-
preferred_during_scheduling_ignored_during_execution: Some(vec![
295-
WeightedPodAffinityTerm {
296-
pod_affinity_term: PodAffinityTerm {
297-
label_selector: Some(LabelSelector {
298-
match_expressions: None,
299-
match_labels: Some(BTreeMap::from([
300-
("app.kubernetes.io/name".to_string(), "hbase".to_string(),),
301-
(
302-
"app.kubernetes.io/instance".to_string(),
303-
"simple-hbase".to_string(),
304-
),
305-
(
306-
"app.kubernetes.io/component".to_string(),
307-
"master".to_string(),
308-
)
309-
]))
310-
}),
311-
namespace_selector: None,
312-
namespaces: None,
313-
topology_key: "kubernetes.io/hostname".to_string(),
314-
},
315-
weight: 70
316-
}
317-
]),
318-
required_during_scheduling_ignored_during_execution: None,
319-
}),
320-
node_affinity: Some(NodeAffinity {
321-
preferred_during_scheduling_ignored_during_execution: None,
322-
required_during_scheduling_ignored_during_execution: Some(NodeSelector {
323-
node_selector_terms: vec![NodeSelectorTerm {
324-
match_expressions: Some(vec![NodeSelectorRequirement {
325-
key: "topology.kubernetes.io/zone".to_string(),
326-
operator: "In".to_string(),
327-
values: Some(vec![
328-
"antarctica-east1".to_string(),
329-
"antarctica-west1".to_string()
330-
]),
331-
}]),
332-
match_fields: None,
333-
}]
334-
}),
335-
}),
336-
node_selector: Some(StackableNodeSelector {
337-
node_selector: BTreeMap::from([("disktype".to_string(), "ssd".to_string())])
338-
}),
339-
}
340-
);
341-
}
342222
}

rust/crd/src/lib.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -520,17 +520,6 @@ impl HbaseCluster {
520520
.map(|rg| rg.config.config.clone())
521521
.unwrap_or_default();
522522

523-
if let Some(RoleGroup {
524-
selector: Some(selector),
525-
..
526-
}) = role.role_groups.get(role_group)
527-
{
528-
// Migrate old `selector` attribute, see ADR 26 affinities.
529-
// TODO Can be removed after support for the old `selector` field is dropped.
530-
#[allow(deprecated)]
531-
conf_rolegroup.affinity.add_legacy_selector(selector);
532-
}
533-
534523
// Merge more specific configs into default config
535524
// Hierarchy is:
536525
// 1. RoleGroup

0 commit comments

Comments
 (0)