Merge pull request #3674 from luthermonson/return-nil

k8s-ci-robot · web-flow · commit ab047bfc2bfe · 2022-08-23T03:07:24.000-07:00
adding a return nil after deleting cni
diff --git a/pkg/cloud/services/awsnode/cni.go b/pkg/cloud/services/awsnode/cni.go
@@ -53,6 +53,7 @@ func (s *Service) ReconcileCNI(ctx context.Context) error {
 		if err := s.deleteCNI(ctx, remoteClient); err != nil {
 			return fmt.Errorf("disabling aws vpc cni: %w", err)
 		}
+		return nil
 	}
 
 	var ds appsv1.DaemonSet

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ func (s *Service) ReconcileCNI(ctx context.Context) error {`
`53`	`53`	`if err := s.deleteCNI(ctx, remoteClient); err != nil {`
`54`	`54`	`return fmt.Errorf("disabling aws vpc cni: %w", err)`
`55`	`55`	`}`
	`56`	`+ return nil`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`var ds appsv1.DaemonSet`