Rename Pdb -> PdbConfig, PdbBuilder -> PodDisruptionBudgetBuilder

stackabletech · Sep 22, 2023 · 73b838c · 73b838c
1 parent 166210e
commit 73b838c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 29 deletions.
diff --git a/src/builder/pdb.rs b/src/builder/pdb.rs
@@ -14,7 +14,7 @@ use k8s_openapi::{
 use kube::{Resource, ResourceExt};
 
 #[derive(Debug, Default)]
-pub struct PdbBuilder<ObjectMeta, LabelSelector, Constraints> {
+pub struct PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, Constraints> {
     metadata: ObjectMeta,
     selector: LabelSelector,
     /// We intentionally only support fixed numbers, no percentage, see ADR 30 on Pod disruptions for details.
@@ -27,9 +27,9 @@ pub struct PdbBuilder<ObjectMeta, LabelSelector, Constraints> {
     _constraints: Constraints,
 }
 
-impl PdbBuilder<(), (), ()> {
+impl PodDisruptionBudgetBuilder<(), (), ()> {
     pub fn new() -> Self {
-        PdbBuilder::default()
+        PodDisruptionBudgetBuilder::default()
     }
 
     pub fn new_with_role<T: Resource<DynamicType = ()>>(
@@ -38,7 +38,7 @@ impl PdbBuilder<(), (), ()> {
         role: &str,
         operator_name: &str,
         controller_name: &str,
-    ) -> OperatorResult<PdbBuilder<ObjectMeta, LabelSelector, ()>> {
+    ) -> OperatorResult<PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, ()>> {
         let role_selector_labels = role_selector_labels(owner, app_name, role);
         let metadata = ObjectMetaBuilder::new()
             .namespace_opt(owner.namespace())
@@ -51,21 +51,21 @@ impl PdbBuilder<(), (), ()> {
             )
             .build();
 
-        Ok(PdbBuilder {
+        Ok(PodDisruptionBudgetBuilder {
             metadata,
             selector: LabelSelector {
                 match_expressions: None,
                 match_labels: Some(role_selector_labels),
             },
-            ..PdbBuilder::default()
+            ..PodDisruptionBudgetBuilder::default()
         })
     }
 
     pub fn new_with_metadata(
         self,
         metadata: impl Into<ObjectMeta>,
-    ) -> PdbBuilder<ObjectMeta, (), ()> {
-        PdbBuilder {
+    ) -> PodDisruptionBudgetBuilder<ObjectMeta, (), ()> {
+        PodDisruptionBudgetBuilder {
             metadata: metadata.into(),
             selector: self.selector,
             max_unavailable: self.max_unavailable,
@@ -75,12 +75,12 @@ impl PdbBuilder<(), (), ()> {
     }
 }
 
-impl PdbBuilder<ObjectMeta, (), ()> {
+impl PodDisruptionBudgetBuilder<ObjectMeta, (), ()> {
     pub fn with_selector(
         self,
         selector: LabelSelector,
-    ) -> PdbBuilder<ObjectMeta, LabelSelector, ()> {
-        PdbBuilder {
+    ) -> PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, ()> {
+        PodDisruptionBudgetBuilder {
             metadata: self.metadata,
             selector,
             max_unavailable: self.max_unavailable,
@@ -90,12 +90,12 @@ impl PdbBuilder<ObjectMeta, (), ()> {
     }
 }
 
-impl PdbBuilder<ObjectMeta, LabelSelector, ()> {
+impl PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, ()> {
     pub fn with_max_unavailable(
         self,
         max_unavailable: u16,
-    ) -> PdbBuilder<ObjectMeta, LabelSelector, bool> {
-        PdbBuilder {
+    ) -> PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, bool> {
+        PodDisruptionBudgetBuilder {
             metadata: self.metadata,
             selector: self.selector,
             max_unavailable: Some(max_unavailable),
@@ -111,8 +111,8 @@ impl PdbBuilder<ObjectMeta, LabelSelector, ()> {
     pub fn with_min_available(
         self,
         min_available: u16,
-    ) -> PdbBuilder<ObjectMeta, LabelSelector, bool> {
-        PdbBuilder {
+    ) -> PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, bool> {
+        PodDisruptionBudgetBuilder {
             metadata: self.metadata,
             selector: self.selector,
             max_unavailable: self.max_unavailable,
@@ -122,7 +122,7 @@ impl PdbBuilder<ObjectMeta, LabelSelector, ()> {
     }
 }
 
-impl PdbBuilder<ObjectMeta, LabelSelector, bool> {
+impl PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, bool> {
     pub fn build(self) -> PodDisruptionBudget {
         PodDisruptionBudget {
             metadata: self.metadata,
@@ -152,12 +152,12 @@ mod test {
 
     use crate::builder::{ObjectMetaBuilder, OwnerReferenceBuilder};
 
-    use super::PdbBuilder;
+    use super::PodDisruptionBudgetBuilder;
 
     #[test]
     pub fn test_normal_build() {
         #[allow(deprecated)]
-        let pdb = PdbBuilder::new()
+        let pdb = PodDisruptionBudgetBuilder::new()
             .new_with_metadata(
                 ObjectMetaBuilder::new()
                     .namespace("default")
@@ -218,10 +218,16 @@ mod test {
         let role = "worker";
         let operator_name = "trino.stackable.tech";
         let controller_name = "trino-operator-trino-controller";
-        let pdb = PdbBuilder::new_with_role(&trino, app_name, role, operator_name, controller_name)
-            .unwrap()
-            .with_max_unavailable(2)
-            .build();
+        let pdb = PodDisruptionBudgetBuilder::new_with_role(
+            &trino,
+            app_name,
+            role,
+            operator_name,
+            controller_name,
+        )
+        .unwrap()
+        .with_max_unavailable(2)
+        .build();
 
         assert_eq!(
             pdb,

diff --git a/src/commons/pdb.rs b/src/commons/pdb.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Pdb {
+pub struct PdbConfig {
     /// Wether a PodDisruptionBudget should be written out for this role.
     /// Disabling this enables you to specify you own - custom - one.
     /// Defaults to true.
@@ -20,7 +20,7 @@ fn default_pdb_enabled() -> bool {
     true
 }
 
-impl Default for Pdb {
+impl Default for PdbConfig {
     fn default() -> Self {
         Self {
             enabled: true,

diff --git a/src/role_utils.rs b/src/role_utils.rs
@@ -86,7 +86,7 @@ use std::{
 };
 
 use crate::{
-    commons::pdb::Pdb,
+    commons::pdb::PdbConfig,
     config::{
         fragment::{self, FromFragment},
         merge::Merge,
@@ -173,10 +173,10 @@ fn config_schema_default() -> serde_json::Value {
 pub struct Role<T> {
     #[serde(flatten)]
     pub config: CommonConfiguration<T>,
-    
+
     #[serde(default)]
     pub role_config: RoleConfig,
-    
+
     pub role_groups: HashMap<String, RoleGroup<T>>,
 }
 
@@ -226,7 +226,7 @@ impl<T: Configuration + 'static> Role<T> {
 #[serde(rename_all = "camelCase")]
 pub struct RoleConfig {
     #[serde(default)]
-    pub pod_disruption_budget: Pdb,
+    pub pod_disruption_budget: PdbConfig,
 }
 
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]