refactor: Move out into get_webhook_client_config

Author: sbernauer

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

@@ -1,7 +1,10 @@
 use async_trait::async_trait;
 use axum::Router;
 pub use conversion_webhook::{ConversionReview, ConversionWebhook, ConversionWebhookError};
-use k8s_openapi::ByteString;
+use k8s_openapi::{
+    ByteString,
+    api::admissionregistration::v1::{ServiceReference, WebhookClientConfig},
+};
 pub use mutating_webhook::{MutatingWebhook, MutatingWebhookError};
 use snafu::Snafu;
 pub use validating_webhook::{ValidatingWebhook, ValidatingWebhookError};
@@ -53,3 +56,25 @@ pub trait Webhook {
         options: &WebhookServerOptions,
     ) -> Result<(), WebhookError>;
 }
+
+/// Returns the client config that can be used in admission webhooks.
+///
+/// It is used to concat the correct HTTP endpoint, which is calculated from the given parameters.
+/// (CRD conversions require a similar, but different, client config).
+fn get_webhook_client_config(
+    options: &WebhookServerOptions,
+    ca_bundle: ByteString,
+    http_path: impl Into<String>,
+) -> WebhookClientConfig {
+    WebhookClientConfig {
+        service: Some(ServiceReference {
+            name: options.webhook_service_name.to_owned(),
+            namespace: options.webhook_namespace.to_owned(),
+            path: Some(http_path.into()),
+            port: Some(options.socket_addr.port().into()),
+        }),
+        // Here, ByteString takes care of encoding the provided content as base64.
+        ca_bundle: Some(ca_bundle),
+        url: None,
+    }
+}

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

@@ -2,12 +2,7 @@ use std::{fmt::Debug, marker::PhantomData, sync::Arc};
 
 use async_trait::async_trait;
 use axum::{Json, Router, routing::post};
-use k8s_openapi::{
-    ByteString,
-    api::admissionregistration::v1::{
-        MutatingWebhookConfiguration, ServiceReference, WebhookClientConfig,
-    },
-};
+use k8s_openapi::{ByteString, api::admissionregistration::v1::MutatingWebhookConfiguration};
 use kube::{
     Api, Client, Resource, ResourceExt,
     api::{Patch, PatchParams},
@@ -19,7 +14,7 @@ use tracing::instrument;
 use x509_cert::Certificate;
 
 use super::{Webhook, WebhookError};
-use crate::WebhookServerOptions;
+use crate::{WebhookServerOptions, webhooks::get_webhook_client_config};
 
 #[derive(Debug, Snafu)]
 pub enum MutatingWebhookError {
@@ -203,17 +198,8 @@ where
 
         for webhook in mutating_webhook_configuration.webhooks.iter_mut().flatten() {
             // We know how we can be called (and with what certificate), so we can always set that
-            webhook.client_config = WebhookClientConfig {
-                service: Some(ServiceReference {
-                    name: options.webhook_service_name.to_owned(),
-                    namespace: options.webhook_namespace.to_owned(),
-                    path: Some(self.http_path()),
-                    port: Some(options.socket_addr.port().into()),
-                }),
-                // Here, ByteString takes care of encoding the provided content as base64.
-                ca_bundle: Some(new_ca_bundle.to_owned()),
-                url: None,
-            };
+            webhook.client_config =
+                get_webhook_client_config(options, new_ca_bundle.to_owned(), self.http_path());
         }
 
         let mwc_api: Api<MutatingWebhookConfiguration> = Api::all(self.client.clone());

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

@@ -2,12 +2,7 @@ use std::{fmt::Debug, marker::PhantomData, sync::Arc};
 
 use async_trait::async_trait;
 use axum::{Json, Router, routing::post};
-use k8s_openapi::{
-    ByteString,
-    api::admissionregistration::v1::{
-        ServiceReference, ValidatingWebhookConfiguration, WebhookClientConfig,
-    },
-};
+use k8s_openapi::{ByteString, api::admissionregistration::v1::ValidatingWebhookConfiguration};
 use kube::{
     Api, Client, Resource, ResourceExt,
     api::{Patch, PatchParams},
@@ -19,7 +14,7 @@ use tracing::instrument;
 use x509_cert::Certificate;
 
 use super::{Webhook, WebhookError};
-use crate::WebhookServerOptions;
+use crate::{WebhookServerOptions, webhooks::get_webhook_client_config};
 
 #[derive(Debug, Snafu)]
 pub enum ValidatingWebhookError {
@@ -148,17 +143,8 @@ where
             .flatten()
         {
             // We know how we can be called (and with what certificate), so we can always set that
-            webhook.client_config = WebhookClientConfig {
-                service: Some(ServiceReference {
-                    name: options.webhook_service_name.to_owned(),
-                    namespace: options.webhook_namespace.to_owned(),
-                    path: Some(self.http_path()),
-                    port: Some(options.socket_addr.port().into()),
-                }),
-                // Here, ByteString takes care of encoding the provided content as base64.
-                ca_bundle: Some(new_ca_bundle.to_owned()),
-                url: None,
-            };
+            webhook.client_config =
+                get_webhook_client_config(options, new_ca_bundle.to_owned(), self.http_path());
         }
 
         let vwc_api: Api<ValidatingWebhookConfiguration> = Api::all(self.client.clone());