fix(admission server): improve reconcile() error handling

Signed-off-by: Wassim DHIF <wassim.dhif@datadoghq.com>
DataDog · Sep 5, 2024 · 3aa0e8c · 3aa0e8c
1 parent 749d651
commit 3aa0e8c
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 50 deletions.
diff --git a/pkg/clusteragent/admission/controllers/webhook/controller_v1.go b/pkg/clusteragent/admission/controllers/webhook/controller_v1.go
@@ -188,38 +188,42 @@ func (c *ControllerV1) reconcile() error {
 		return err
 	}
 
-	validatingWebhook, err := c.validatingWebhooksLister.Get(c.config.getWebhookName())
-	if err != nil {
-		if errors.IsNotFound(err) {
-			log.Infof("Validating Webhook %s was not found, creating it", c.config.getWebhookName())
-			err := c.createValidatingWebhook(secret)
+	if c.config.mutationEnabled {
+		mutatingWebhook, err := c.mutatingWebhooksLister.Get(c.config.getWebhookName())
+		if err != nil {
+			if errors.IsNotFound(err) {
+				log.Infof("Mutating Webhook %s was not found, creating it", c.config.getWebhookName())
+				err := c.createMutatingWebhook(secret)
+				if err != nil {
+					_ = log.Errorf("Failed to create Mutating Webhook %s: %v", c.config.getWebhookName(), err)
+				}
+			}
+		} else {
+			log.Debugf("Mutating Webhook %s was found, updating it", c.config.getWebhookName())
+			err := c.updateMutatingWebhook(secret, mutatingWebhook)
 			if err != nil {
-				_ = log.Errorf("Failed to create Validating Webhook %s: %v", c.config.getWebhookName(), err)
+				_ = log.Errorf("Failed to update Mutating Webhook %s: %v", c.config.getWebhookName(), err)
 			}
 		}
-	} else {
-		log.Debugf("Validating Webhook %s was found, updating it", c.config.getWebhookName())
-		err := c.updateValidatingWebhook(secret, validatingWebhook)
-		if err != nil {
-			_ = log.Errorf("Failed to update Validating Webhook %s: %v", c.config.getWebhookName(), err)
-		}
 	}
 
-	mutatingWebhook, err := c.mutatingWebhooksLister.Get(c.config.getWebhookName())
-	if err != nil {
-		if errors.IsNotFound(err) {
-			log.Infof("Mutating Webhook %s was not found, creating it", c.config.getWebhookName())
-			err := c.createMutatingWebhook(secret)
+	if c.config.validationEnabled {
+		validatingWebhook, err := c.validatingWebhooksLister.Get(c.config.getWebhookName())
+		if err != nil {
+			if errors.IsNotFound(err) {
+				log.Infof("Validating Webhook %s was not found, creating it", c.config.getWebhookName())
+				err := c.createValidatingWebhook(secret)
+				if err != nil {
+					_ = log.Errorf("Failed to create Validating Webhook %s: %v", c.config.getWebhookName(), err)
+				}
+			}
+		} else {
+			log.Debugf("Validating Webhook %s was found, updating it", c.config.getWebhookName())
+			err := c.updateValidatingWebhook(secret, validatingWebhook)
 			if err != nil {
-				_ = log.Errorf("Failed to create Mutating Webhook %s: %v", c.config.getWebhookName(), err)
+				_ = log.Errorf("Failed to update Validating Webhook %s: %v", c.config.getWebhookName(), err)
 			}
 		}
-	} else {
-		log.Debugf("Mutating Webhook %s was found, updating it", c.config.getWebhookName())
-		err := c.updateMutatingWebhook(secret, mutatingWebhook)
-		if err != nil {
-			_ = log.Errorf("Failed to update Mutating Webhook %s: %v", c.config.getWebhookName(), err)
-		}
 	}
 
 	return err

diff --git a/pkg/clusteragent/admission/controllers/webhook/controller_v1beta1.go b/pkg/clusteragent/admission/controllers/webhook/controller_v1beta1.go
@@ -183,45 +183,47 @@ func (c *ControllerV1beta1) handleWebhookUpdate(oldObj, newObj interface{}) {
 
 // reconcile creates/updates the webhook object on new events.
 func (c *ControllerV1beta1) reconcile() error {
-	var err error
-
 	secret, err := c.getSecret()
 	if err != nil {
 		return err
 	}
 
-	validatingWebhook, err := c.validatingWebhooksLister.Get(c.config.getWebhookName())
-	if err != nil {
-		if errors.IsNotFound(err) {
-			log.Infof("Webhook %s was not found, creating it", c.config.getWebhookName())
-			err = c.createValidatingWebhook(secret)
+	if c.config.mutationEnabled {
+		mutatingWebhook, err := c.mutatingWebhooksLister.Get(c.config.getWebhookName())
+		if err != nil {
+			if errors.IsNotFound(err) {
+				log.Infof("Webhook %s was not found, creating it", c.config.getWebhookName())
+				err = c.createMutatingWebhook(secret)
+				if err != nil {
+					_ = log.Errorf("Failed to create Mutating Webhook %s: %v", c.config.getWebhookName(), err)
+				}
+			}
+		} else {
+			log.Debugf("The Webhook %s was found, updating it", c.config.getWebhookName())
+			err = c.updateMutatingWebhook(secret, mutatingWebhook)
 			if err != nil {
-				_ = log.Errorf("Failed to create Validating Webhook %s: %v", c.config.getWebhookName(), err)
+				_ = log.Errorf("Failed to update Mutating Webhook %s: %v", c.config.getWebhookName(), err)
 			}
 		}
-	} else {
-		log.Debugf("The Webhook %s was found, updating it", c.config.getWebhookName())
-		err = c.updateValidatingWebhook(secret, validatingWebhook)
-		if err != nil {
-			_ = log.Errorf("Failed to update Validating Webhook %s: %v", c.config.getWebhookName(), err)
-		}
 	}
 
-	mutatingWebhook, err := c.mutatingWebhooksLister.Get(c.config.getWebhookName())
-	if err != nil {
-		if errors.IsNotFound(err) {
-			log.Infof("Webhook %s was not found, creating it", c.config.getWebhookName())
-			err = c.createMutatingWebhook(secret)
+	if c.config.validationEnabled {
+		validatingWebhook, err := c.validatingWebhooksLister.Get(c.config.getWebhookName())
+		if err != nil {
+			if errors.IsNotFound(err) {
+				log.Infof("Webhook %s was not found, creating it", c.config.getWebhookName())
+				err = c.createValidatingWebhook(secret)
+				if err != nil {
+					_ = log.Errorf("Failed to create Validating Webhook %s: %v", c.config.getWebhookName(), err)
+				}
+			}
+		} else {
+			log.Debugf("The Webhook %s was found, updating it", c.config.getWebhookName())
+			err = c.updateValidatingWebhook(secret, validatingWebhook)
 			if err != nil {
-				_ = log.Errorf("Failed to create Mutating Webhook %s: %v", c.config.getWebhookName(), err)
+				_ = log.Errorf("Failed to update Validating Webhook %s: %v", c.config.getWebhookName(), err)
 			}
 		}
-	} else {
-		log.Debugf("The Webhook %s was found, updating it", c.config.getWebhookName())
-		err = c.updateMutatingWebhook(secret, mutatingWebhook)
-		if err != nil {
-			_ = log.Errorf("Failed to update Mutating Webhook %s: %v", c.config.getWebhookName(), err)
-		}
 	}
 
 	return err