Add CLI flag to disable mutating webhook

Author: sbernauer

rust/operator-binary/src/main.rs

@@ -17,11 +17,11 @@ use stackable_operator::{
     shared::yaml::SerializeOptions,
     telemetry::Tracing,
 };
-use webhooks::create_webhook;
+use webhook::create_webhook;
 
 mod restart_controller;
 mod utils;
-mod webhooks;
+mod webhook;
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
@@ -34,7 +34,20 @@ pub const FIELD_MANAGER: &str = "commons-operator";
 #[clap(about, author)]
 struct Opts {
     #[clap(subcommand)]
-    cmd: Command,
+    cmd: Command<CommonsOperatorRunArguments>,
+}
+
+#[derive(Debug, PartialEq, Eq, Parser)]
+pub struct CommonsOperatorRunArguments {
+    #[command(flatten)]
+    pub common: RunArguments,
+
+    /// Don't start the controller mutating webhook and maintain the MutatingWebhookConfiguration.
+    ///
+    /// The mutating webhook is used to prevent an unneeded restart of the first Pod of freshly
+    /// created StatefulSets. It can be turned off in case you can accept an unneeded Pod restart.
+    #[arg(long, env)]
+    pub disable_restarter_mutating_webhook: bool,
 }
 
 #[tokio::main]
@@ -49,12 +62,16 @@ async fn main() -> anyhow::Result<()> {
             S3Bucket::merged_crd(S3BucketVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
-        Command::Run(RunArguments {
-            product_config: _,
-            watch_namespace,
-            operator_environment,
-            maintenance,
-            common,
+        Command::Run(CommonsOperatorRunArguments {
+            common:
+                RunArguments {
+                    product_config: _,
+                    watch_namespace,
+                    operator_environment,
+                    maintenance,
+                    common,
+                },
+            disable_restarter_mutating_webhook,
         }) => {
             // NOTE (@NickLarsenNZ): Before stackable-telemetry was used:
             // - The console log level was set by `COMMONS_OPERATOR_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured).
@@ -98,8 +115,7 @@ async fn main() -> anyhow::Result<()> {
             let webhook = create_webhook(
                 ctx,
                 &operator_environment,
-                // TODO: Make user configurable
-                false,
+                disable_restarter_mutating_webhook,
                 client.as_kube_client(),
             )
             .await?;

rust/operator-binary/src/webhook/mod.rs

@@ -0,0 +1,50 @@
+use std::sync::Arc;
+
+use restarter_mutate_sts::{add_sts_restarter_annotation, get_mutating_webhook_configuration};
+use snafu::{ResultExt, Snafu};
+use stackable_operator::{
+    cli::OperatorEnvironmentOptions,
+    kube::Client,
+    webhook::{
+        WebhookError, WebhookOptions, WebhookServer,
+        servers::{MutatingWebhookServer, WebhookServerImplementation},
+    },
+};
+
+use crate::{FIELD_MANAGER, restart_controller::statefulset::Ctx};
+
+mod restarter_mutate_sts;
+
+#[derive(Debug, Snafu)]
+pub enum Error {
+    #[snafu(display("failed to create webhook server"))]
+    CreateWebhookServer { source: WebhookError },
+}
+
+pub async fn create_webhook<'a>(
+    ctx: Arc<Ctx>,
+    operator_environment: &'a OperatorEnvironmentOptions,
+    disable_restarter_mutating_webhook: bool,
+    client: Client,
+) -> Result<WebhookServer, Error> {
+    let mut webhooks: Vec<Box<dyn WebhookServerImplementation>> = vec![];
+    if !disable_restarter_mutating_webhook {
+        webhooks.push(Box::new(MutatingWebhookServer::new(
+            get_mutating_webhook_configuration(),
+            add_sts_restarter_annotation,
+            ctx,
+            disable_restarter_mutating_webhook,
+            client,
+            FIELD_MANAGER.to_owned(),
+        )));
+    }
+
+    let webhook_options = WebhookOptions {
+        socket_addr: WebhookServer::DEFAULT_SOCKET_ADDRESS,
+        operator_namespace: operator_environment.operator_namespace.to_owned(),
+        operator_service_name: operator_environment.operator_service_name.to_owned(),
+    };
+    WebhookServer::new(webhook_options, webhooks)
+        .await
+        .context(CreateWebhookServerSnafu)
+}

rust/operator-binary/src/webhooks.rs …nary/src/webhook/restarter_mutate_sts.rsrust/operator-binary/src/webhooks.rs renamed to rust/operator-binary/src/webhook/restarter_mutate_sts.rs rust/operator-binary/src/webhooks.rs renamed to rust/operator-binary/src/webhook/restarter_mutate_sts.rs

@@ -1,10 +1,8 @@
 use std::{collections::BTreeMap, sync::Arc};
 
 use json_patch::{AddOperation, Patch, PatchOperation, jsonptr::PointerBuf};
-use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::meta::ObjectMetaBuilder,
-    cli::OperatorEnvironmentOptions,
     k8s_openapi::{
         api::{
             admissionregistration::v1::{
@@ -15,51 +13,16 @@ use stackable_operator::{
         },
         apimachinery::pkg::apis::meta::v1::LabelSelector,
     },
-    kube::{
-        Client,
-        core::admission::{AdmissionRequest, AdmissionResponse},
-    },
+    kube::core::admission::{AdmissionRequest, AdmissionResponse},
     kvp::Label,
-    webhook::{WebhookError, WebhookOptions, WebhookServer, servers::MutatingWebhookServer},
 };
 
 use crate::{
-    FIELD_MANAGER, OPERATOR_NAME,
+    OPERATOR_NAME,
     restart_controller::statefulset::{Ctx, get_updated_restarter_annotations},
 };
 
-#[derive(Debug, Snafu)]
-pub enum Error {
-    #[snafu(display("failed to create webhook server"))]
-    CreateWebhookServer { source: WebhookError },
-}
-
-pub async fn create_webhook<'a>(
-    ctx: Arc<Ctx>,
-    operator_environment: &'a OperatorEnvironmentOptions,
-    disable_mutating_webhook_configuration_maintenance: bool,
-    client: Client,
-) -> Result<WebhookServer, Error> {
-    let mutating_webhook_server = MutatingWebhookServer::new(
-        get_mutating_webhook_configuration(),
-        add_sts_restarter_annotation,
-        ctx,
-        disable_mutating_webhook_configuration_maintenance,
-        client,
-        FIELD_MANAGER.to_owned(),
-    );
-
-    let webhook_options = WebhookOptions {
-        socket_addr: WebhookServer::DEFAULT_SOCKET_ADDRESS,
-        operator_namespace: operator_environment.operator_namespace.to_owned(),
-        operator_service_name: operator_environment.operator_service_name.to_owned(),
-    };
-    WebhookServer::new(webhook_options, vec![Box::new(mutating_webhook_server)])
-        .await
-        .context(CreateWebhookServerSnafu)
-}
-
-fn get_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
+pub fn get_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
     let webhook_name = "restarter-sts-enricher.stackable.tech";
     let metadata = ObjectMetaBuilder::new()
         .name(webhook_name)
@@ -107,7 +70,7 @@ fn get_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
     }
 }
 
-async fn add_sts_restarter_annotation(
+pub async fn add_sts_restarter_annotation(
     ctx: Arc<Ctx>,
     request: AdmissionRequest<StatefulSet>,
 ) -> AdmissionResponse {