Skip to content

Commit

Permalink
[bug] Fixed the panic for uninitialized docker daemon
Browse files Browse the repository at this point in the history
Signed-off-by: Manik2708 <[email protected]>
  • Loading branch information
Manik2708 committed Feb 22, 2025
1 parent dce6e1d commit 3bfb0cc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions KubeArmor/core/dockerHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ func (dm *KubeArmorDaemon) MonitorDockerEvents() {
Docker, err = NewDockerHandler()
if err != nil {
dm.Logger.Errf("Failed to create new Docker client: %s", err)
return
}
}

Expand Down
9 changes: 6 additions & 3 deletions KubeArmor/core/kubeArmor.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,10 +623,11 @@ func KubeArmor() {
// update already deployed containers
err := dm.GetAlreadyDeployedDockerContainers()
if err != nil {
dm.DestroyKubeArmorDaemon()
dm.Logger.Warnf("Failed to get already deployed docker containers %s", err.Error())
} else {
// monitor docker events
go dm.MonitorDockerEvents()
}
// monitor docker events
go dm.MonitorDockerEvents()
} else if strings.Contains(cfg.GlobalCfg.CRISocket, "containerd") {
// insuring NRI monitoring only in case containerd is present
if cfg.GlobalCfg.NRIEnabled && dm.checkNRIAvailability() {
Expand Down Expand Up @@ -669,6 +670,7 @@ func KubeArmor() {
err := dm.GetAlreadyDeployedDockerContainers()
if err != nil {
dm.DestroyKubeArmorDaemon()
return
}
// monitor docker events
go dm.MonitorDockerEvents()
Expand Down Expand Up @@ -700,6 +702,7 @@ func KubeArmor() {
err := dm.GetAlreadyDeployedDockerContainers()
if err != nil {
dm.DestroyKubeArmorDaemon()
return
}
// monitor docker events
go dm.MonitorDockerEvents()
Expand Down

0 comments on commit 3bfb0cc

Please sign in to comment.