chore(webhook): Adjust CA bundle handling

Author: Techassi

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

@@ -22,8 +22,7 @@ use snafu::{ResultExt, Snafu};
 use tokio::sync::oneshot;
 use tracing::instrument;
 
-use super::{Webhook, WebhookError};
-use crate::WebhookServerOptions;
+use crate::{Webhook, WebhookError, WebhookServerOptions};
 
 #[derive(Debug, Snafu)]
 pub enum ConversionWebhookError {
@@ -138,7 +137,7 @@ impl<H> ConversionWebhook<H> {
     }
 
     #[instrument(
-        skip(self, crd, crd_api, new_ca_bundle),
+        skip(self, crd, crd_api, ca_bundle),
         fields(
             name = crd.name_any(),
             kind = &crd.spec.names.kind
@@ -148,7 +147,7 @@ impl<H> ConversionWebhook<H> {
         &self,
         mut crd: CustomResourceDefinition,
         crd_api: &Api<CustomResourceDefinition>,
-        new_ca_bundle: &ByteString,
+        ca_bundle: ByteString,
         options: &WebhookServerOptions,
     ) -> Result<(), WebhookError> {
         let crd_kind = &crd.spec.names.kind;
@@ -178,7 +177,7 @@ impl<H> ConversionWebhook<H> {
                         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()),
+                    ca_bundle: Some(ca_bundle),
                     url: None,
                 }),
             }),
@@ -247,15 +246,15 @@ where
         self.options.disable_crd_maintenance
     }
 
-    #[instrument(skip(self, new_ca_bundle))]
+    #[instrument(skip(self, ca_bundle))]
     async fn handle_certificate_rotation(
         &mut self,
-        new_ca_bundle: &ByteString,
+        ca_bundle: &ByteString,
         options: &WebhookServerOptions,
     ) -> Result<(), WebhookError> {
         let crd_api: Api<CustomResourceDefinition> = Api::all(self.client.clone());
         for (crd, _) in &self.crds_and_handlers {
-            self.reconcile_crd(crd.clone(), &crd_api, new_ca_bundle, options)
+            self.reconcile_crd(crd.clone(), &crd_api, ca_bundle.to_owned(), options)
                 .await?;
         }
 

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

@@ -48,7 +48,7 @@ pub trait Webhook {
     /// Webhooks are informed about new certificates by this function and can react accordingly.
     async fn handle_certificate_rotation(
         &mut self,
-        new_ca_bundle: &ByteString,
+        ca_bundle: &ByteString,
         options: &WebhookServerOptions,
     ) -> Result<(), WebhookError>;
 }

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

@@ -12,8 +12,7 @@ use serde::{Serialize, de::DeserializeOwned};
 use snafu::{ResultExt, Snafu};
 use tracing::instrument;
 
-use super::{Webhook, WebhookError};
-use crate::{WebhookServerOptions, webhooks::create_webhook_client_config};
+use crate::{Webhook, WebhookError, WebhookServerOptions, webhooks::create_webhook_client_config};
 
 #[derive(Debug, Snafu)]
 pub enum MutatingWebhookError {
@@ -209,14 +208,15 @@ where
         self.options.disable_mwc_maintenance
     }
 
-    #[instrument(skip(self, new_ca_bundle))]
+    #[instrument(skip(self, ca_bundle))]
     async fn handle_certificate_rotation(
         &mut self,
-        new_ca_bundle: &ByteString,
+        ca_bundle: &ByteString,
         options: &WebhookServerOptions,
     ) -> Result<(), WebhookError> {
         let mut mutating_webhook_configuration = self.mutating_webhook_configuration.clone();
         let mwc_name = mutating_webhook_configuration.name_any();
+
         tracing::info!(
             k8s.mutatingwebhookconfiguration.name = mwc_name,
             "reconciling mutating webhook configurations"
@@ -225,7 +225,7 @@ 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 =
-                create_webhook_client_config(options, new_ca_bundle.to_owned(), self.http_path());
+                create_webhook_client_config(options, ca_bundle.to_owned(), self.http_path());
         }
 
         let mwc_api: Api<MutatingWebhookConfiguration> = Api::all(self.client.clone());