Derive Default for KubernetesClusterInfoOpts

Author: sbernauer

crates/stackable-operator/src/cli.rs

@@ -177,7 +177,6 @@ pub enum Command<Run: Args = ProductOperatorRun> {
 /// use stackable_operator::{
 ///     logging::TracingTarget,
 ///     namespace::WatchNamespace,
-///     utils::cluster_info::KubernetesClusterInfoOpts
 /// };
 ///
 /// let opts = Command::<Run>::parse_from(["foobar-operator", "run", "--name", "foo", "--product-config", "bar", "--watch-namespace", "foobar"]);
@@ -187,9 +186,7 @@ pub enum Command<Run: Args = ProductOperatorRun> {
 ///         product_config: ProductConfigPath::from("bar".as_ref()),
 ///         watch_namespace: WatchNamespace::One("foobar".to_string()),
 ///         tracing_target: TracingTarget::None,
-///         cluster_info_opts: KubernetesClusterInfoOpts {
-///             kubernetes_cluster_domain: None
-///         }
+///         cluster_info_opts: Default::default(),
 ///     },
 /// }));
 /// ```
@@ -399,9 +396,7 @@ mod tests {
                 product_config: ProductConfigPath::from("bar".as_ref()),
                 watch_namespace: WatchNamespace::One("foo".to_string()),
                 tracing_target: TracingTarget::None,
-                cluster_info_opts: KubernetesClusterInfoOpts {
-                    kubernetes_cluster_domain: None
-                }
+                cluster_info_opts: Default::default(),
             }
         );
 
@@ -413,9 +408,7 @@ mod tests {
                 product_config: ProductConfigPath::from("bar".as_ref()),
                 watch_namespace: WatchNamespace::All,
                 tracing_target: TracingTarget::None,
-                cluster_info_opts: KubernetesClusterInfoOpts {
-                    kubernetes_cluster_domain: None
-                }
+                cluster_info_opts: Default::default(),
             }
         );
 
@@ -428,9 +421,7 @@ mod tests {
                 product_config: ProductConfigPath::from("bar".as_ref()),
                 watch_namespace: WatchNamespace::One("foo".to_string()),
                 tracing_target: TracingTarget::None,
-                cluster_info_opts: KubernetesClusterInfoOpts {
-                    kubernetes_cluster_domain: None
-                }
+                cluster_info_opts: Default::default(),
             }
         );
     }

crates/stackable-operator/src/client.rs

@@ -521,18 +521,12 @@ impl Client {
     /// use tokio::time::error::Elapsed;
     /// use kube::runtime::watcher;
     /// use k8s_openapi::api::core::v1::Pod;
-    /// use stackable_operator::{
-    ///     client::{Client, initialize_operator},
-    ///     utils::cluster_info::KubernetesClusterInfoOpts
-    /// };
+    /// use stackable_operator::client::{Client, initialize_operator};
     ///
     /// #[tokio::main]
     /// async fn main() {
     ///
-    /// let cluster_info_cli_opts = KubernetesClusterInfoOpts {
-    ///     kubernetes_cluster_domain: None,
-    /// };
-    /// let client = initialize_operator(None, &cluster_info_cli_opts)
+    /// let client = initialize_operator(None, &Default::default())
     ///     .await
     ///     .expect("Unable to construct client.");
     /// let watcher_config: watcher::Config =
@@ -676,15 +670,10 @@ mod tests {
     };
     use tokio::time::error::Elapsed;
 
-    use crate::utils::cluster_info::KubernetesClusterInfoOpts;
-
     #[tokio::test]
     #[ignore = "Tests depending on Kubernetes are not ran by default"]
     async fn k8s_test_wait_created() {
-        let cluster_info_cli_opts = KubernetesClusterInfoOpts {
-            kubernetes_cluster_domain: None,
-        };
-        let client = super::initialize_operator(None, &cluster_info_cli_opts)
+        let client = super::initialize_operator(None, &Default::default())
             .await
             .expect("KUBECONFIG variable must be configured.");
 
@@ -762,10 +751,7 @@ mod tests {
     #[tokio::test]
     #[ignore = "Tests depending on Kubernetes are not ran by default"]
     async fn k8s_test_wait_created_timeout() {
-        let cluster_info_cli_opts = KubernetesClusterInfoOpts {
-            kubernetes_cluster_domain: None,
-        };
-        let client = super::initialize_operator(None, &cluster_info_cli_opts)
+        let client = super::initialize_operator(None, &Default::default())
             .await
             .expect("KUBECONFIG variable must be configured.");
 
@@ -785,10 +771,7 @@ mod tests {
     #[tokio::test]
     #[ignore = "Tests depending on Kubernetes are not ran by default"]
     async fn k8s_test_list_with_label_selector() {
-        let cluster_info_cli_opts = KubernetesClusterInfoOpts {
-            kubernetes_cluster_domain: None,
-        };
-        let client = super::initialize_operator(None, &cluster_info_cli_opts)
+        let client = super::initialize_operator(None, &Default::default())
             .await
             .expect("KUBECONFIG variable must be configured.");
 

crates/stackable-operator/src/utils/cluster_info.rs

@@ -9,7 +9,7 @@ pub struct KubernetesClusterInfo {
     pub cluster_domain: DomainName,
 }
 
-#[derive(clap::Parser, Debug, PartialEq, Eq)]
+#[derive(clap::Parser, Debug, Default, PartialEq, Eq)]
 pub struct KubernetesClusterInfoOpts {
     /// Kubernetes cluster domain, usually this is `cluster.local`.
     // We are not using a default value here, as operators will probably do an more advanced