[bug] Fixed the panic for uninitialized docker daemon

Signed-off-by: Manik2708 <[email protected]>
kubearmor · Feb 1, 2025 · fa1bdac · fa1bdac
1 parent 9656a7f
commit fa1bdac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/KubeArmor/core/dockerHandler.go b/KubeArmor/core/dockerHandler.go
@@ -258,13 +258,14 @@ func (dm *KubeArmorDaemon) SetContainerVisibility(containerID string) {
 }
 
 // GetAlreadyDeployedDockerContainers Function
-func (dm *KubeArmorDaemon) GetAlreadyDeployedDockerContainers() {
+func (dm *KubeArmorDaemon) GetAlreadyDeployedDockerContainers() error {
 	// check if Docker exists else instantiate
 	if Docker == nil {
 		var err error
 		Docker, err = NewDockerHandler()
 		if err != nil {
 			dm.Logger.Errf("Failed to create new Docker client: %s", err)
+			return err
 		}
 	}
 
@@ -455,6 +456,7 @@ func (dm *KubeArmorDaemon) GetAlreadyDeployedDockerContainers() {
 	} else {
 		dm.Logger.Warnf("Error while listing containers: %s", err)
 	}
+	return nil
 }
 
 // UpdateDockerContainer Function

diff --git a/KubeArmor/core/kubeArmor.go b/KubeArmor/core/kubeArmor.go
@@ -621,7 +621,10 @@ func KubeArmor() {
 			// monitor containers
 			if strings.Contains(cfg.GlobalCfg.CRISocket, "docker") {
 				// update already deployed containers
-				dm.GetAlreadyDeployedDockerContainers()
+				err := dm.GetAlreadyDeployedDockerContainers()
+				if err != nil {
+					dm.DestroyKubeArmorDaemon()
+				}
 				// monitor docker events
 				go dm.MonitorDockerEvents()
 			} else if strings.Contains(cfg.GlobalCfg.CRISocket, "containerd") {
@@ -663,7 +666,10 @@ func KubeArmor() {
 			// monitor containers
 			if strings.Contains(dm.Node.ContainerRuntimeVersion, "docker") || strings.Contains(cfg.GlobalCfg.CRISocket, "docker") {
 				// update already deployed containers
-				dm.GetAlreadyDeployedDockerContainers()
+				err := dm.GetAlreadyDeployedDockerContainers()
+				if err != nil {
+					dm.DestroyKubeArmorDaemon()
+				}
 				// monitor docker events
 				go dm.MonitorDockerEvents()
 			} else if strings.Contains(dm.Node.ContainerRuntimeVersion, "containerd") || strings.Contains(cfg.GlobalCfg.CRISocket, "containerd") {
@@ -691,8 +697,10 @@ func KubeArmor() {
 					cfg.GlobalCfg.CRISocket = "unix://" + socketFile
 
 					// update already deployed containers
-					dm.GetAlreadyDeployedDockerContainers()
-
+					err := dm.GetAlreadyDeployedDockerContainers()
+					if err != nil {
+						dm.DestroyKubeArmorDaemon()
+					}
 					// monitor docker events
 					go dm.MonitorDockerEvents()
 				} else {