feat(expand CRDs): Moved comparison into its own function and updated how condition is evaluated for []string

Author: MatteoMori8

vault.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/uswitch/vault-webhook/pkg/apis/vaultwebhook.uswitch.com/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 )
@@ -108,32 +108,9 @@ func addVault(pod *corev1.Pod, namespace string, databases []database) (patch []
 
 		initContainer := vaultContainer
 
-		// TODO: This is likely to be in a function by itself
-		// Conditionally set Lifecycle if it exists in containerSpec
-		if vaultContainerSpec.Lifecycle.PreStop.Exec.Command != nil {
-			vaultContainer.Lifecycle = &corev1.Lifecycle{
-				PreStop: &corev1.LifecycleHandler{
-					Exec: &corev1.ExecAction{
-						Command: vaultContainerSpec.Lifecycle.PreStop.Exec.Command,
-					},
-				},
-			}
-		}
-
-		// Conditionally set Lifecycle if it exists in InitContainerSpec
-		if len(initVaultContainerSpec.Lifecycle.PreStop.Exec.Command) > 0 {
-			log.Info("I AM NOT EMPTY")
-			log.Infof("ContainerSpec Lifecycle Command content: %+v", initVaultContainerSpec.Lifecycle.PreStop.Exec.Command)
-			log.Infof("ContainerSpec Lifecycle Command type: %T", initVaultContainerSpec.Lifecycle.PreStop.Exec.Command)
-			// 	initContainer.Lifecycle = &corev1.Lifecycle{
-			// 		PreStop: &corev1.LifecycleHandler{
-			// 			Exec: &corev1.ExecAction{
-			// 				Command: initVaultContainerSpec.Lifecycle.PreStop.Exec.Command,
-			// 			},
-			// 		},
-			// 	}
-		}
-		// TODO: End function to wrap
+		// Configure Lifecycle Hooks if spec exists
+		initContainer = addLifecycleHook(initContainer, initVaultContainerSpec)
+		vaultContainer = addLifecycleHook(vaultContainer, vaultContainerSpec)
 
 		jobLikeOwnerReferencesKinds := map[string]bool{"Job": true, "Workflow": true}
 		if len(pod.ObjectMeta.OwnerReferences) != 0 {
@@ -228,3 +205,17 @@ func appendVolumeMountIfMissing(slice []corev1.VolumeMount, v corev1.VolumeMount
 	}
 	return append(slice, v)
 }
+
+func addLifecycleHook(container corev1.Container, containerSpec v1alpha1.Container) corev1.Container {
+	// Conditionally set Lifecycle if it exists in containerSpec
+	if len(containerSpec.Lifecycle.PreStop.Exec.Command) > 0 {
+		container.Lifecycle = &corev1.Lifecycle{
+			PreStop: &corev1.LifecycleHandler{
+				Exec: &corev1.ExecAction{
+					Command: containerSpec.Lifecycle.PreStop.Exec.Command,
+				},
+			},
+		}
+	}
+	return container
+}