Merge pull request #16284 from vrothberg/fix-16076

notifyproxy: fix container watcher

pkg/systemd/notifyproxy/notifyproxy.go

@@ -183,20 +183,21 @@ func (p *NotifyProxy) WaitAndClose() error {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		go func() {
-			select {
+			for {
-			case <-ctx.Done():
+				select {
-				return
+				case <-ctx.Done():
-			default:
-				state, err := p.container.State()
-				if err != nil {
-					p.errorChan <- err
 					return
+				case <-time.After(time.Second):
+					state, err := p.container.State()
+					if err != nil {
+						p.errorChan <- err
+						return
+					}
+					if state != define.ContainerStateRunning {
+						p.errorChan <- fmt.Errorf("%w: %s", ErrNoReadyMessage, p.container.ID())
+						return
+					}
 				}
-				if state != define.ContainerStateRunning {
-					p.errorChan <- fmt.Errorf("%w: %s", ErrNoReadyMessage, p.container.ID())
-					return
-				}
-				time.Sleep(time.Second)
 			}
 		}()
 	}