Skip to content

Commit 8737b10

Browse files
Felix Hennigfhennig
Felix Hennig
and
fhennig
committed
Removed affinity property that was added by accitdent (#522)
## Description I wanted to add the affinity functions to the PodBuilder, not the RoleGroup. Oops. Co-authored-by: Felix Hennig <fhennig@users.noreply.github.com>
1 parent c230299 commit 8737b10

File tree

3 files changed

+6
-25
lines changed

3 files changed

+6
-25
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Removed
8+
9+
- Removed `affinity` property from the RoleGroup that was added in [#520] but not intended to be there ([#552]).
10+
11+
[#552]: https://github.com/stackabletech/operator-rs/pull/522
12+
713
## [0.30.0] - 2022-12-19
814

915
### Added

‎src/product_config_utils.rs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,6 @@ mod tests {
625625
build_env_override(GROUP_ENV_OVERRIDE),
626626
build_cli_override(GROUP_CLI_OVERRIDE)),
627627
selector: None,
628-
affinity: None,
629628
}},
630629
},
631630
(true, true, true, false) => Role {
@@ -640,7 +639,6 @@ mod tests {
640639
config: build_common_config(
641640
build_test_config(GROUP_CONFIG, GROUP_ENV, GROUP_CLI), None, None, None),
642641
selector: None,
643-
affinity: None,
644642
}},
645643
},
646644
(true, true, false, true) => Role {
@@ -658,7 +656,6 @@ mod tests {
658656
build_env_override(GROUP_ENV_OVERRIDE),
659657
build_cli_override(GROUP_CLI_OVERRIDE)),
660658
selector: None,
661-
affinity: None,
662659
}},
663660
},
664661
(true, true, false, false) => Role {
@@ -676,7 +673,6 @@ mod tests {
676673
None,
677674
None),
678675
selector: None,
679-
affinity: None,
680676
}},
681677
},
682678
(true, false, true, true) => Role {
@@ -694,7 +690,6 @@ mod tests {
694690
build_env_override(GROUP_ENV_OVERRIDE),
695691
build_cli_override(GROUP_CLI_OVERRIDE)),
696692
selector: None,
697-
affinity: None,
698693
}},
699694
},
700695
(true, false, true, false) => Role {
@@ -708,7 +703,6 @@ mod tests {
708703
replicas: Some(1),
709704
config: CommonConfiguration::default(),
710705
selector: None,
711-
affinity: None,
712706
}},
713707
},
714708
(true, false, false, true) => Role {
@@ -727,7 +721,6 @@ mod tests {
727721
build_cli_override(GROUP_CLI_OVERRIDE)
728722
),
729723
selector: None,
730-
affinity: None,
731724
}},
732725
},
733726
(true, false, false, false) => Role {
@@ -741,7 +734,6 @@ mod tests {
741734
replicas: Some(1),
742735
config: CommonConfiguration::default(),
743736
selector: None,
744-
affinity: None,
745737
}},
746738
},
747739
(false, true, true, true) => Role {
@@ -759,7 +751,6 @@ mod tests {
759751
build_env_override(GROUP_ENV_OVERRIDE),
760752
build_cli_override(GROUP_CLI_OVERRIDE)),
761753
selector: None,
762-
affinity: None,
763754
}},
764755
},
765756
(false, true, true, false) => Role {
@@ -777,7 +768,6 @@ mod tests {
777768
None,
778769
None),
779770
selector: None,
780-
affinity: None,
781771
}},
782772
},
783773
(false, true, false, true) => Role {
@@ -790,7 +780,6 @@ mod tests {
790780
build_env_override(GROUP_ENV_OVERRIDE),
791781
build_cli_override(GROUP_CLI_OVERRIDE)),
792782
selector: None,
793-
affinity: None,
794783
}},
795784
},
796785
(false, true, false, false) => Role {
@@ -803,7 +792,6 @@ mod tests {
803792
None,
804793
None),
805794
selector: None,
806-
affinity: None,
807795
}},
808796
},
809797
(false, false, true, true) => Role {
@@ -821,7 +809,6 @@ mod tests {
821809
build_env_override(GROUP_ENV_OVERRIDE),
822810
build_cli_override(GROUP_CLI_OVERRIDE)),
823811
selector: None,
824-
affinity: None,
825812
}},
826813
},
827814
(false, false, true, false) => Role {
@@ -835,7 +822,6 @@ mod tests {
835822
replicas: Some(1),
836823
config: CommonConfiguration::default(),
837824
selector: None,
838-
affinity: None,
839825
}},
840826
},
841827
(false, false, false, true) => Role {
@@ -848,7 +834,6 @@ mod tests {
848834
build_env_override(GROUP_ENV_OVERRIDE),
849835
build_cli_override(GROUP_CLI_OVERRIDE)),
850836
selector: None,
851-
affinity: None,
852837
}},
853838
},
854839
(false, false, false, false) => Role {
@@ -857,7 +842,6 @@ mod tests {
857842
replicas: Some(1),
858843
config: CommonConfiguration::default(),
859844
selector: None,
860-
affinity: None,
861845
}},
862846
},
863847
}
@@ -1062,7 +1046,6 @@ mod tests {
10621046
build_env_override(GROUP_ENV_OVERRIDE),
10631047
None),
10641048
selector: None,
1065-
affinity: None,
10661049
}},
10671050
};
10681051

@@ -1122,7 +1105,6 @@ mod tests {
11221105
None
11231106
),
11241107
selector: None,
1125-
affinity: None,
11261108
},
11271109
role_group_2.to_string() => RoleGroup {
11281110
replicas: Some(1),
@@ -1133,7 +1115,6 @@ mod tests {
11331115
None
11341116
),
11351117
selector: None,
1136-
affinity: None,
11371118
}}
11381119
}),
11391120
role_2.to_string() => (vec![PropertyNameKind::Cli], Role {
@@ -1152,7 +1133,6 @@ mod tests {
11521133
None
11531134
),
11541135
selector: None,
1155-
affinity: None,
11561136
}},
11571137
})
11581138
};
@@ -1215,7 +1195,6 @@ mod tests {
12151195
None
12161196
),
12171197
selector: None,
1218-
affinity: None,
12191198
}}
12201199
}
12211200
),
@@ -1231,7 +1210,6 @@ mod tests {
12311210
None
12321211
),
12331212
selector: None,
1234-
affinity: None,
12351213
}}
12361214
}
12371215
),

‎src/role_utils.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ use crate::{
9393
product_config_utils::Configuration,
9494
};
9595
use derivative::Derivative;
96-
use k8s_openapi::api::core::v1::Affinity;
9796
use k8s_openapi::apimachinery::pkg::apis::meta::v1::LabelSelector;
9897
use kube::{runtime::reflector::ObjectRef, Resource};
9998
use schemars::JsonSchema;
@@ -166,7 +165,6 @@ impl<T: Configuration + 'static> Role<T> {
166165
},
167166
replicas: group.replicas,
168167
selector: group.selector,
169-
affinity: group.affinity,
170168
},
171169
)
172170
})
@@ -185,7 +183,6 @@ pub struct RoleGroup<T> {
185183
pub config: CommonConfiguration<T>,
186184
pub replicas: Option<u16>,
187185
pub selector: Option<LabelSelector>,
188-
pub affinity: Option<Affinity>,
189186
}
190187

191188
impl<T> RoleGroup<T> {

0 commit comments

Comments
 (0)