feat(expand CRDs): Changed typing of CRD object to simplify data handling

Author: MatteoMori8

pkg/apis/vaultwebhook.uswitch.com/v1alpha1/types.go

@@ -1,6 +1,7 @@
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -34,17 +35,5 @@ type DatabaseCredentialBindingList struct {
 }
 
 type Container struct {
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
-}
-
-type Lifecycle struct {
-	PreStop LifecycleHandler `json:"preStop,omitempty"`
-}
-
-type LifecycleHandler struct {
-	Exec ExecAction `json:"exec,omitempty"`
-}
-
-type ExecAction struct {
-	Command []string `json:"command,omitempty"`
+	Lifecycle corev1.Lifecycle `json:"lifecycle,omitempty"`
 }

vault.go

@@ -207,22 +207,17 @@ func appendVolumeMountIfMissing(slice []corev1.VolumeMount, v corev1.VolumeMount
 	return append(slice, v)
 }
 
+// Conditionally set Lifecycle if it exists in containerSpec
 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,
-				},
-			},
-		}
-		// TODO: Fix support for initcontainer's Lifecycle hooks ( Go dep to be updated )
-		// Init containers must have RestartPolicy=Always to be able to support Lifecycle hooks
-		// if isInit {
-		// 	restartPolicy := corev1.ContainerRestartPolicyAlways
-		// 	container.RestartPolicy = &restartPolicy
-		// }
+	if container.Lifecycle != nil {
+		container.Lifecycle = &containerSpec.Lifecycle
 	}
+	// TODO: Fix support for initcontainer's Lifecycle hooks ( Go dep to be updated )
+	// Init containers must have RestartPolicy=Always to be able to support Lifecycle hooks
+	// if isInit {
+	// 	restartPolicy := corev1.ContainerRestartPolicyAlways
+	// 	container.RestartPolicy = &restartPolicy
+	// }
+	//}
 	return container
 }

webhook.go

@@ -198,7 +198,7 @@ func matchBindings(bindings []v1alpha1.DatabaseCredentialBinding, serviceAccount
 			if output == "" {
 				output = "/etc/database"
 			}
-			//log.Infof("[matchBindings] Printing content of Container: %+v", binding.Spec.Container)
+			log.Infof("[matchBindings] Printing content of Container: %+v", binding.Spec.Container)
 			//log.Infof("[matchBindings] Printing content of InitContainer: %+v", binding.Spec.InitContainer)
 
 			matchedBindings = appendIfMissing(matchedBindings, database{