fixup! fixup! fixup! fixup! fixup! fixup! fixes

Signed-off-by: Oleksii Kurinnyi <[email protected]>

Author: akurinnoy

test/e2e/pkg/tests/custom_init_container_tests.go

@@ -18,6 +18,7 @@ package tests
 import (
 	"context"
 	"fmt"
+	"log"
 	"os/exec"
 	"path/filepath"
 	"runtime"
@@ -27,6 +28,7 @@ import (
 	"github.com/devfile/devworkspace-operator/test/e2e/pkg/config"
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -63,21 +65,30 @@ var _ = ginkgo.Describe("[Custom Init Container Tests]", func() {
 			if err != nil {
 				ginkgo.Fail(fmt.Sprintf("Failed to apply DWOC: %s. Output: %s", err, string(output)))
 			}
+			// Give the controller a moment to sync the DWOC config
+			// The config is synced via predicates, but we want to ensure it's processed
+			ginkgo.GinkgoWriter.Printf("Applied DWOC config, waiting for sync...\n")
 		})
 
 		ginkgo.It("Create workspace and verify custom init-persistent-home executed", func() {
+			log.Printf("[TEST] Starting: Create workspace and verify custom init-persistent-home executed")
+			ginkgo.GinkgoWriter.Printf("Starting test: Create workspace and verify custom init-persistent-home executed\n")
 			workspaceFile := filepath.Join(getProjectRoot(), "test", "resources", "custom-init-test-workspace.yaml")
 			commandResult, err := config.DevK8sClient.OcApplyWorkspace(config.DevWorkspaceNamespace, workspaceFile)
 			if err != nil {
 				ginkgo.Fail(fmt.Sprintf("Failed to create workspace with custom init: %s %s", err.Error(), commandResult))
 				return
 			}
+			log.Printf("[TEST] Workspace %s created, waiting for Running status...", workspaceName)
+			ginkgo.GinkgoWriter.Printf("Workspace %s created, waiting for Running status...\n", workspaceName)
 
 			// Wait for workspace to be running
 			deploy, err := config.DevK8sClient.WaitDevWsStatus(workspaceName, config.DevWorkspaceNamespace, dw.DevWorkspaceStatusRunning)
 			if !deploy {
 				ginkgo.Fail(fmt.Sprintf("Workspace didn't start properly. Error: %s", err))
 			}
+			log.Printf("[TEST] Workspace %s is Running, waiting for pod...", workspaceName)
+			ginkgo.GinkgoWriter.Printf("Workspace %s is Running, waiting for pod...\n", workspaceName)
 
 			// Wait for pod to be running (may take a while for large image pulls)
 			podSelector := fmt.Sprintf("controller.devfile.io/devworkspace_name=%s", workspaceName)
@@ -86,17 +97,62 @@ var _ = ginkgo.Describe("[Custom Init Container Tests]", func() {
 				podName, err = config.AdminK8sClient.GetPodNameBySelector(podSelector, config.DevWorkspaceNamespace)
 				return err
 			}, "10m", "5s").Should(gomega.Succeed())
+			log.Printf("[TEST] Pod %s found, checking init container...", podName)
+			ginkgo.GinkgoWriter.Printf("Pod %s found, checking init container...\n", podName)
 
-			// Wait for init container to complete and verify it succeeded
+			// Wait for init container to be present in pod spec and complete successfully
+			// Generated by Cursor AI - Enhanced diagnostics for init container status checking
 			gomega.Eventually(func() error {
 				pod, err := config.AdminK8sClient.Kube().CoreV1().Pods(config.DevWorkspaceNamespace).Get(context.TODO(), podName, metav1.GetOptions{})
 				if err != nil {
 					return err
 				}
+
+				// First, check if init container is defined in pod spec
+				initContainerInSpec := false
+				var foundInitContainer *corev1.Container
+				for i := range pod.Spec.InitContainers {
+					if pod.Spec.InitContainers[i].Name == constants.HomeInitComponentName {
+						initContainerInSpec = true
+						foundInitContainer = &pod.Spec.InitContainers[i]
+						break
+					}
+				}
+
+				if !initContainerInSpec {
+					// List all init containers in spec for debugging
+					initContainerNames := make([]string, 0, len(pod.Spec.InitContainers))
+					for _, initContainer := range pod.Spec.InitContainers {
+						initContainerNames = append(initContainerNames, initContainer.Name)
+					}
+					// Also check pod phase and conditions for more context
+					podPhase := pod.Status.Phase
+					return fmt.Errorf("init container %s not found in pod spec (pod phase: %s). Found init containers: %v. Pod conditions: %+v",
+						constants.HomeInitComponentName, podPhase, initContainerNames, pod.Status.Conditions)
+				}
+
+				// Verify the init container has the expected command
+				if foundInitContainer != nil {
+					if len(foundInitContainer.Command) == 0 || foundInitContainer.Command[0] != "/bin/sh" {
+						return fmt.Errorf("init container %s has unexpected command: %v. Expected: [/bin/sh, -c]",
+							constants.HomeInitComponentName, foundInitContainer.Command)
+					}
+				}
+
+				// Check init container status - it may not be populated immediately
 				for _, status := range pod.Status.InitContainerStatuses {
 					if status.Name == constants.HomeInitComponentName {
 						if status.State.Terminated == nil {
-							return fmt.Errorf("init container %s still running", constants.HomeInitComponentName)
+							if status.State.Waiting != nil {
+								return fmt.Errorf("init container %s is waiting: %s (reason: %s)",
+									constants.HomeInitComponentName, status.State.Waiting.Message, status.State.Waiting.Reason)
+							}
+							if status.State.Running != nil {
+								// Still running, which is fine - we'll check again
+								return fmt.Errorf("init container %s still running", constants.HomeInitComponentName)
+							}
+							// Status exists but state is nil - might be initializing
+							return fmt.Errorf("init container %s status exists but state is nil (may be initializing)", constants.HomeInitComponentName)
 						}
 						if status.State.Terminated.ExitCode != 0 {
 							// Get logs for debugging
@@ -111,18 +167,35 @@ var _ = ginkgo.Describe("[Custom Init Container Tests]", func() {
 								status.State.Terminated.Message,
 								logMsg)
 						}
+						// Success!
+						log.Printf("[TEST] Init container %s completed successfully with exit code 0", constants.HomeInitComponentName)
+						ginkgo.GinkgoWriter.Printf("Init container %s completed successfully with exit code 0\n", constants.HomeInitComponentName)
 						return nil
 					}
 				}
-				return fmt.Errorf("init container %s status not found", constants.HomeInitComponentName)
-			}, "5m", "5s").Should(gomega.Succeed(), "Init container should complete successfully")
 
+				// Init container is in spec but status not found yet
+				// This can happen if the pod was just created and init containers haven't started
+				statusNames := make([]string, 0, len(pod.Status.InitContainerStatuses))
+				for _, status := range pod.Status.InitContainerStatuses {
+					statusNames = append(statusNames, status.Name)
+				}
+				return fmt.Errorf("init container %s is in pod spec but status not found yet (pod phase: %s). Found statuses: %v. This may be normal if the pod was just created",
+					constants.HomeInitComponentName, pod.Status.Phase, statusNames)
+			}, "5m", "2s").Should(gomega.Succeed(), "Init container should complete successfully")
+
+			log.Printf("[TEST] Init container verification passed, checking marker file...")
+			ginkgo.GinkgoWriter.Printf("Init container verification passed, checking marker file...\n")
 			// Check that the custom init script ran by verifying the marker file exists
 			resultOfExecCommand, err := config.DevK8sClient.ExecCommandInContainer(podName, config.DevWorkspaceNamespace, "tooling", "test -f /home/user/.custom_init_complete && echo 'SUCCESS' || echo 'FAILED'")
 			if err != nil {
 				ginkgo.Fail(fmt.Sprintf("Cannot execute command in container. Error: `%s`. Exec output: `%s`", err, resultOfExecCommand))
 			}
+			log.Printf("[TEST] Marker file check result: %s", resultOfExecCommand)
+			ginkgo.GinkgoWriter.Printf("Marker file check result: %s\n", resultOfExecCommand)
 			gomega.Expect(resultOfExecCommand).To(gomega.ContainSubstring("SUCCESS"))
+			log.Printf("[TEST] ✓ Test PASSED: custom init-persistent-home executed and marker file created")
+			ginkgo.GinkgoWriter.Printf("Test completed successfully: custom init-persistent-home executed and marker file created\n")
 		})
 
 		ginkgo.AfterEach(func() {