From 5ad29d60e383e3ae38be73d742b46578f678ea44 Mon Sep 17 00:00:00 2001
From: jillianwilson <jillian.morgan@agilebits.com>
Date: Thu, 4 Nov 2021 17:05:56 -0300
Subject: [PATCH] Addressing pr comments

---
 secret-injector/pkg/webhook/webhook.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/secret-injector/pkg/webhook/webhook.go b/secret-injector/pkg/webhook/webhook.go
index d493b17..117f1a7 100644
--- a/secret-injector/pkg/webhook/webhook.go
+++ b/secret-injector/pkg/webhook/webhook.go
@@ -226,6 +226,12 @@ func (whsvr *WebhookServer) mutate(ar *v1beta1.AdmissionReview) *v1beta1.Admissi
 
 	containers := map[string]struct{}{}
 
+	if containersStr == "" {
+		glog.Infof("No mutations made for %s/%s", pod.Namespace, pod.Name)
+		return &v1beta1.AdmissionResponse{
+			Allowed: true,
+		}
+	}
 	for _, container := range strings.Split(containersStr, ",") {
 		containers[container] = struct{}{}
 	}
@@ -280,6 +286,13 @@ func (whsvr *WebhookServer) mutate(ar *v1beta1.AdmissionReview) *v1beta1.Admissi
 		}
 	}
 
+	if !mutated {
+		glog.Infof("No mutations made for %s/%s", pod.Namespace, pod.Name)
+		return &v1beta1.AdmissionResponse{
+			Allowed: true,
+		}
+	}
+
 	// binInitContainer is the container that pulls the OP CLI
 	// into a shared volume mount.
 	var binInitContainer = corev1.Container{
@@ -296,12 +309,6 @@ func (whsvr *WebhookServer) mutate(ar *v1beta1.AdmissionReview) *v1beta1.Admissi
 		},
 	}
 
-	if !mutated {
-		glog.Infof("No mutations made for %s/%s", pod.Namespace, pod.Name)
-		return &v1beta1.AdmissionResponse{
-			Allowed: true,
-		}
-	}
 	annotations := map[string]string{injectionStatus: "injected"}
 	patchBytes, err := createOPCLIPatch(&pod, annotations, []corev1.Container{binInitContainer}, patch)
 	if err != nil {