fix merge conflicts

Author: sbernauer

crates/stackable-webhook/src/lib.rs

@@ -3,15 +3,9 @@
 //!
 //! Currently the following webhooks are supported:
 //!
-<<<<<<< HEAD
-//! ```
-//! use axum::Router;
-//! use stackable_webhook::{WebhookOptions, WebhookServer};
-=======
 //! * [webhooks::ConversionWebhook]
 //! * [webhooks::MutatingWebhook]
 //! * In the future validating webhooks wil be added
->>>>>>> origin/main
 //!
 //! This library is fully compatible with the  [`tracing`] crate and emits debug level tracing data.
 //!
@@ -64,9 +58,7 @@ pub enum WebhookServerError {
 /// ### Example usage
 ///
 /// ```
-/// use stackable_webhook::WebhookServer;
-/// use stackable_webhook::WebhookServerOptions;
-/// use stackable_webhook::webhooks::Webhook;
+/// use stackable_webhook::{WebhookServer, WebhookServerOptions, webhooks::Webhook};
 ///
 /// # async fn docs() {
 /// let mut webhooks: Vec<Box<dyn Webhook>> = vec![];

crates/stackable-webhook/src/webhooks/conversion_webhook.rs

@@ -43,40 +43,41 @@ pub enum ConversionWebhookError {
 /// ```
 /// use std::sync::Arc;
 ///
-/// use stackable_operator::crd::s3::{S3Connection, S3ConnectionVersion};
-/// use stackable_operator::kube::{Client, core::admission::{AdmissionRequest, AdmissionResponse}};
-/// use stackable_webhook::WebhookServer;
-/// use stackable_webhook::webhooks::{ConversionWebhook, ConversionWebhookOptions};
+/// use stackable_operator::{
+///     crd::s3::{S3Connection, S3ConnectionVersion},
+///     kube::{
+///         Client,
+///         core::admission::{AdmissionRequest, AdmissionResponse},
+///     },
+/// };
+/// use stackable_webhook::{
+///     WebhookServer,
+///     webhooks::{ConversionWebhook, ConversionWebhookOptions},
+/// };
 ///
 /// # async fn docs() {
 /// // The Kubernetes client
 /// let client = Client::try_default().await.unwrap();
 /// // Read in from user input, e.g. CLI arguments
 /// let disable_crd_maintenance = false;
 ///
-/// let crds_and_handlers = vec![
-///     (
-///         S3Connection::merged_crd(S3ConnectionVersion::V1Alpha1)
-///             .expect("the S3Connection CRD must be merged"),
-///         S3Connection::try_convert,
-///     )
-/// ];
+/// let crds_and_handlers = vec![(
+///     S3Connection::merged_crd(S3ConnectionVersion::V1Alpha1)
+///         .expect("the S3Connection CRD must be merged"),
+///     S3Connection::try_convert,
+/// )];
 ///
-/// let conversion_webhook_options = ConversionWebhookOptions{
+/// let conversion_webhook_options = ConversionWebhookOptions {
 ///     disable_crd_maintenance,
 ///     field_manager: "my-field-manager".to_owned(),
 /// };
-/// let (conversion_webhook, initial_reconcile_rx) = ConversionWebhook::new(
-///     crds_and_handlers,
-///     client,
-///     conversion_webhook_options,
-/// );
+/// let (conversion_webhook, initial_reconcile_rx) =
+///     ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
 ///
 /// let webhook_options = todo!();
-/// let webhook_server = WebhookServer::new(
-///     vec![Box::new(conversion_webhook)],
-///     webhook_options,
-/// ).await.unwrap();
+/// let webhook_server = WebhookServer::new(vec![Box::new(conversion_webhook)], webhook_options)
+///     .await
+///     .unwrap();
 /// webhook_server.run().await.unwrap();
 /// # }
 /// ```

crates/stackable-webhook/src/webhooks/mutating_webhook.rs

@@ -40,13 +40,17 @@ pub enum MutatingWebhookError {
 /// ```
 /// use std::sync::Arc;
 ///
-/// use k8s_openapi::api::admissionregistration::v1::MutatingWebhookConfiguration;
-/// use k8s_openapi::api::apps::v1::StatefulSet;
-///
-/// use stackable_operator::kube::Client;
-/// use stackable_operator::kube::core::admission::{AdmissionRequest, AdmissionResponse};
-/// use stackable_webhook::WebhookServer;
-/// use stackable_webhook::webhooks::{MutatingWebhook, MutatingWebhookOptions};
+/// use k8s_openapi::api::{
+///     admissionregistration::v1::MutatingWebhookConfiguration, apps::v1::StatefulSet,
+/// };
+/// use stackable_operator::kube::{
+///     Client,
+///     core::admission::{AdmissionRequest, AdmissionResponse},
+/// };
+/// use stackable_webhook::{
+///     WebhookServer,
+///     webhooks::{MutatingWebhook, MutatingWebhookOptions},
+/// };
 ///
 /// # async fn docs() {
 /// // The Kubernetes client
@@ -56,7 +60,7 @@ pub enum MutatingWebhookError {
 /// // Read in from user input, e.g. CLI arguments
 /// let disable_mwc_maintenance = false;
 ///
-/// let mutating_webhook_options = MutatingWebhookOptions{
+/// let mutating_webhook_options = MutatingWebhookOptions {
 ///     disable_mwc_maintenance,
 ///     field_manager: "my-field-manager".to_owned(),
 /// };
@@ -69,19 +73,23 @@ pub enum MutatingWebhookError {
 /// ));
 ///
 /// let webhook_options = todo!();
-/// let webhook_server = WebhookServer::new(vec![mutating_webhook], webhook_options).await.unwrap();
+/// let webhook_server = WebhookServer::new(vec![mutating_webhook], webhook_options)
+///     .await
+///     .unwrap();
 /// webhook_server.run().await.unwrap();
 /// # }
 ///
 /// fn get_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
 ///     let webhook_name = "pod-labeler.stackable.tech";
 ///
 ///     MutatingWebhookConfiguration {
-///         webhooks: Some(vec![k8s_openapi::api::admissionregistration::v1::MutatingWebhook {
-///             // This is checked by the stackable_webhook code
-///             admission_review_versions: vec!["v1".to_owned()],
-///             ..Default::default()
-///         }]),
+///         webhooks: Some(vec![
+///             k8s_openapi::api::admissionregistration::v1::MutatingWebhook {
+///                 // This is checked by the stackable_webhook code
+///                 admission_review_versions: vec!["v1".to_owned()],
+///                 ..Default::default()
+///             },
+///         ]),
 ///         ..Default::default()
 ///     }
 /// }