Pull in new op-rs version

Author: sbernauer

Cargo.lock

@@ -226,7 +226,9 @@ pub async fn get_updated_restarter_annotations(
     sts: &StatefulSet,
     ctx: Arc<Ctx>,
 ) -> Result<BTreeMap<String, String>, Error> {
-    let ns = sts.metadata.namespace.as_deref().unwrap();
+    let ns = sts.metadata.namespace.as_deref().expect(
+        "A StatefulSet observed by a reflector (so send by Kubernetes) always has a namespace set",
+    );
     let mut annotations = BTreeMap::<String, String>::new();
     let pod_specs = sts
         .spec

Cargo.nix

@@ -1,13 +1,15 @@
 use std::sync::Arc;
 
-use restarter_mutate_sts::{add_sts_restarter_annotation, get_mutating_webhook_configuration};
+use restarter_mutate_sts::{
+    add_sts_restarter_annotations_handler, get_sts_restarter_mutating_webhook_configuration,
+};
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     cli::OperatorEnvironmentOptions,
     kube::Client,
     webhook::{
-        WebhookError, WebhookOptions, WebhookServer,
-        servers::{MutatingWebhookServer, WebhookServerImplementation},
+        WebhookServer, WebhookServerError, WebhookServerOptions,
+        webhooks::{MutatingWebhook, Webhook},
     },
 };
 
@@ -18,7 +20,7 @@ mod restarter_mutate_sts;
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to create webhook server"))]
-    CreateWebhookServer { source: WebhookError },
+    CreateWebhookServer { source: WebhookServerError },
 }
 
 pub async fn create_webhook_server(
@@ -27,22 +29,22 @@ pub async fn create_webhook_server(
     disable_restarter_mutating_webhook: bool,
     client: Client,
 ) -> Result<WebhookServer, Error> {
-    let mut webhooks: Vec<Box<dyn WebhookServerImplementation>> = vec![];
+    let mut webhooks: Vec<Box<dyn Webhook>> = vec![];
     if !disable_restarter_mutating_webhook {
-        webhooks.push(Box::new(MutatingWebhookServer::new(
-            get_mutating_webhook_configuration(),
-            add_sts_restarter_annotation,
+        webhooks.push(Box::new(MutatingWebhook::new(
+            get_sts_restarter_mutating_webhook_configuration(),
+            add_sts_restarter_annotations_handler,
             ctx,
             disable_restarter_mutating_webhook,
             client,
             FIELD_MANAGER.to_owned(),
         )));
     }
 
-    let webhook_options = WebhookOptions {
+    let webhook_options = WebhookServerOptions {
         socket_addr: WebhookServer::DEFAULT_SOCKET_ADDRESS,
-        operator_namespace: operator_environment.operator_namespace.to_owned(),
-        operator_service_name: operator_environment.operator_service_name.to_owned(),
+        webhook_namespace: operator_environment.operator_namespace.to_owned(),
+        webhook_service_name: operator_environment.operator_service_name.to_owned(),
     };
     WebhookServer::new(webhook_options, webhooks)
         .await

rust/operator-binary/src/restart_controller/statefulset.rs

@@ -22,7 +22,7 @@ use crate::{
     restart_controller::statefulset::{Ctx, get_updated_restarter_annotations},
 };
 
-pub fn get_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
+pub fn get_sts_restarter_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
     let webhook_name = "restarter-sts-enricher.stackable.tech";
     let metadata = ObjectMetaBuilder::new()
         .name(webhook_name)
@@ -56,21 +56,26 @@ pub fn get_mutating_webhook_configuration() -> MutatingWebhookConfiguration {
             }),
             // Will be set by the stackable_webhook code
             client_config: WebhookClientConfig::default(),
-            // Worst case the annotations are missing cause a restart of Pod 0, basically the same
-            // behavior which we had for years.
+            // Worst case if the annotations are missing they cause a restart of Pod 0, basically
+            // the same behavior which we had for years.
             // See https://github.com/stackabletech/commons-operator/issues/111 for details
             failure_policy: Some("Ignore".to_owned()),
-            // It could be the case that other mutating webhooks add more ConfigMpa/Secret mounts,
+            // It could be the case that other mutating webhooks add more ConfigMap/Secret mounts,
             // in which case it would be nice if we detect that.
             reinvocation_policy: Some("IfNeeded".to_owned()),
-            // We don't have side effects
+            // > Webhooks typically operate only on the content of the AdmissionReview sent to them.
+            // > Some webhooks, however, make out-of-band changes as part of processing admission requests.
+            //
+            // We read in the state of the world using the ConfigMap and Secret store.
+            // So, technically our outcome depends on external factors, *but* this webhook is not
+            // creating any external objects, so from our understanding it's side-effect free.
             side_effects: "None".to_owned(),
             ..Default::default()
         }]),
     }
 }
 
-pub async fn add_sts_restarter_annotation(
+pub async fn add_sts_restarter_annotations_handler(
     ctx: Arc<Ctx>,
     request: AdmissionRequest<StatefulSet>,
 ) -> AdmissionResponse {