Skip to content

Commit 2d5708c

Browse files
authored
Fix ACN issue 436 for surfacing CNI errors to kubelet. (Azure#501)
1 parent 0576688 commit 2d5708c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cni/network/network.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
382382
if errConsAdd != nil {
383383
log.Printf("handleConsecutiveAdd failed with error %v", errConsAdd)
384384
result = resultConsAdd
385-
return errConsAdd
385+
err = errConsAdd
386+
return err
386387
}
387388

388389
if resultConsAdd != nil {

cni/network/plugin/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func main() {
206206
}
207207

208208
if recover() != nil {
209-
return
209+
os.Exit(1)
210210
}
211211
}()
212212

0 commit comments

Comments
 (0)