doc(expand CRDs): Clean comments

uswitch · Feb 11, 2025 · e9a5a92 · e9a5a92
1 parent 8ecc71c
commit e9a5a92
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 14 deletions.
diff --git a/pkg/apis/vaultwebhook.uswitch.com/v1alpha1/types.go b/pkg/apis/vaultwebhook.uswitch.com/v1alpha1/types.go
@@ -22,7 +22,6 @@ type DatabaseCredentialBindingSpec struct {
 	OutputFile     string    `json:"outputFile"`
 	ServiceAccount string    `json:"serviceAccount"`
 	Container      Container `json:"container,omitempty"`
-	// InitContainer  Container `json:"initcontainer,omitempty"` // TODO: Fix support for initcontainer's Lifecycle hooks  ( Go dep to be updated )
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/vault.go b/vault.go
@@ -26,7 +26,6 @@ func addVault(pod *corev1.Pod, namespace string, databases []database) (patch []
 	for _, databaseInfo := range databases {
 
 		vaultContainerSpec := databaseInfo.vaultContainer
-		//initVaultContainerSpec := databaseInfo.initVaultContainer // TODO: Fix support for initcontainer's Lifecycle hooks  ( Go dep to be updated )
 
 		database := databaseInfo.database
 		role := databaseInfo.role
@@ -109,7 +108,6 @@ func addVault(pod *corev1.Pod, namespace string, databases []database) (patch []
 		initContainer := vaultContainer
 
 		// Configure Lifecycle Hooks if spec exists
-		// initContainer = addLifecycleHook(initContainer, initVaultContainerSpec) // TODO: Fix support for initcontainer's Lifecycle hooks  ( Go dep to be updated )
 		vaultContainer = addLifecycleHook(vaultContainer, vaultContainerSpec)
 
 		jobLikeOwnerReferencesKinds := map[string]bool{"Job": true, "Workflow": true}
@@ -220,12 +218,5 @@ func addLifecycleHook(container corev1.Container, containerSpec v1alpha1.Contain
 		}
 
 	}
-	// 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
 }
diff --git a/webhook.go b/webhook.go
@@ -43,7 +43,6 @@ type database struct {
 	outputPath     string
 	outputFile     string
 	vaultContainer v1alpha1.Container
-	// initVaultContainer v1alpha1.Container // TODO: Fix support for initcontainer's Lifecycle hooks  ( Go dep to be updated )
 }
 
 func (srv webHookServer) serve(w http.ResponseWriter, r *http.Request) {
@@ -199,15 +198,13 @@ func matchBindings(bindings []v1alpha1.DatabaseCredentialBinding, serviceAccount
 				output = "/etc/database"
 			}
 			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{
 				role:           binding.Spec.Role,
 				database:       binding.Spec.Database,
 				outputPath:     output,
 				outputFile:     binding.Spec.OutputFile,
 				vaultContainer: binding.Spec.Container,
-				//initVaultContainer: binding.Spec.InitContainer, // TODO: Fix support for initcontainer's Lifecycle hooks  ( Go dep to be updated )
 			})
 		}
 	}
@@ -216,7 +213,7 @@ func matchBindings(bindings []v1alpha1.DatabaseCredentialBinding, serviceAccount
 
 func appendIfMissing(slice []database, d database) []database {
 	for _, ele := range slice {
-		// No need to compare the Container and InitContainer fields.
+		// No need to compare Container fields.
 		if ele.role == d.role &&
 			ele.database == d.database &&
 			ele.outputPath == d.outputPath &&