Merge pull request #1 from sbueringer/pr-27-upgrade-adjusted

update

Author: mythi

pkg/log/zap/zap_test.go

@@ -209,6 +209,8 @@ var _ = Describe("Zap logger setup", func() {
 			})
 
 			It("should log a standard non-namespaced NamespacedName name", func() {
+				Skip("Skipping until we bumped k/k to v0.27.2")
+
 				name := types.NamespacedName{Name: "some-node"}
 				logger.Info("here's a kubernetes object", "thing", name)
 
@@ -243,6 +245,8 @@ var _ = Describe("Zap logger setup", func() {
 			})
 
 			It("should log a standard namespaced NamespacedName name and namespace", func() {
+				Skip("Skipping until we bumped k/k to v0.27.2")
+
 				name := types.NamespacedName{Name: "some-pod", Namespace: "some-ns"}
 				logger.Info("here's a kubernetes object", "thing", name)
 

pkg/manager/internal.go

@@ -458,22 +458,22 @@ func (cm *controllerManager) Start(ctx context.Context) (err error) {
 	// between conversion webhooks and the cache sync (usually initial list) which causes the webhooks
 	// to never start because no cache can be populated.
 	if err := cm.runnables.Webhooks.Start(cm.internalCtx); err != nil {
-		if !errors.Is(err, context.Canceled) {
-			return err
+		if err != nil {
+			return fmt.Errorf("failed to start webhooks: %w", err)
 		}
 	}
 
 	// Start and wait for caches.
 	if err := cm.runnables.Caches.Start(cm.internalCtx); err != nil {
-		if !errors.Is(err, context.Canceled) {
-			return err
+		if err != nil {
+			return fmt.Errorf("failed to start caches: %w", err)
 		}
 	}
 
 	// Start the non-leaderelection Runnables after the cache has synced.
 	if err := cm.runnables.Others.Start(cm.internalCtx); err != nil {
-		if !errors.Is(err, context.Canceled) {
-			return err
+		if err != nil {
+			return fmt.Errorf("failed to start other runnables: %w", err)
 		}
 	}