OCPNODE-1632: Bump k8s api to v0.29.0

cmd/machine-config-daemon/start.go

@@ -194,12 +194,12 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 	case <-ctrlctx.FeatureGateAccess.InitialFeatureGatesObserved():
 		featureGates, err := ctrlctx.FeatureGateAccess.CurrentFeatureGates()
 		if err != nil {
-			klog.Fatalf("Could not get FG: %w", err)
+			klog.Fatalf("Could not get FG: %v", err)
 		} else {
 			klog.Infof("FeatureGates initialized: knownFeatureGates=%v", featureGates.KnownFeatures())
 		}
 	case <-time.After(1 * time.Minute):
-		klog.Fatalf("Could not get FG, timed out: %w", err)
+		klog.Fatalf("Could not get FG, timed out: %v", err)
 	}
 
 	if err := dn.Run(stopCh, exitCh); err != nil {

cmd/machine-config-operator/start.go

@@ -117,12 +117,12 @@ func runStartCmd(_ *cobra.Command, _ []string) {
 		case <-ctrlctx.FeatureGateAccess.InitialFeatureGatesObserved():
 			featureGates, err := ctrlctx.FeatureGateAccess.CurrentFeatureGates()
 			if err != nil {
-				klog.Fatalf("Could not get FG: %w", err)
+				klog.Fatalf("Could not get FG: %v", err)
 			} else {
 				klog.Infof("FeatureGates initialized: knownFeatureGates=%v", featureGates.KnownFeatures())
 			}
 		case <-time.After(1 * time.Minute):
-			klog.Fatalf("Could not get FG, timed out: %w", err)
+			klog.Fatalf("Could not get FG, timed out: %v", err)
 		}
 
 		go controller.Run(2, ctrlctx.Stop)

pkg/controller/drain/drain_controller.go

@@ -324,7 +324,7 @@ func (ctrl *Controller) syncNode(key string) error {
 				ctrl.featureGatesAccessor,
 			)
 			if nErr != nil {
-				klog.Errorf("Error making MCN for Uncordon failure: %w", err)
+				klog.Errorf("Error making MCN for Uncordon failure: %v", err)
 			}
 			return fmt.Errorf("failed to uncordon node %v: %w", node.Name, err)
 
@@ -339,7 +339,7 @@ func (ctrl *Controller) syncNode(key string) error {
 			ctrl.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for UnCordon success: %w", err)
+			klog.Errorf("Error making MCN for UnCordon success: %v", err)
 		}
 	case daemonconsts.DrainerStateDrain:
 
@@ -402,7 +402,7 @@ func (ctrl *Controller) drainNode(node *corev1.Node, drainer *drain.Helper) erro
 				ctrl.featureGatesAccessor,
 			)
 			if Nerr != nil {
-				klog.Errorf("Error making MCN for Cordon Failure: %w", Nerr)
+				klog.Errorf("Error making MCN for Cordon Failure: %v", Nerr)
 			}
 			return fmt.Errorf("node %s: failed to cordon: %w", node.Name, err)
 		}
@@ -416,7 +416,7 @@ func (ctrl *Controller) drainNode(node *corev1.Node, drainer *drain.Helper) erro
 			ctrl.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Cordon Success: %w", err)
+			klog.Errorf("Error making MCN for Cordon Success: %v", err)
 		}
 	}
 
@@ -432,7 +432,7 @@ func (ctrl *Controller) drainNode(node *corev1.Node, drainer *drain.Helper) erro
 		ctrl.featureGatesAccessor,
 	)
 	if err != nil {
-		klog.Errorf("Error making MCN for Drain beginning: %w", err)
+		klog.Errorf("Error making MCN for Drain beginning: %v", err)
 	}
 	if err := drain.RunNodeDrain(drainer, node.Name); err != nil {
 		// To mimic our old daemon logic, we should probably have a more nuanced backoff.
@@ -459,7 +459,7 @@ func (ctrl *Controller) drainNode(node *corev1.Node, drainer *drain.Helper) erro
 			ctrl.featureGatesAccessor,
 		)
 		if nErr != nil {
-			klog.Errorf("Error making MCN for Drain failure: %w", nErr)
+			klog.Errorf("Error making MCN for Drain failure: %v", nErr)
 		}
 
 		// Return early without deleting the ongoing drain.
@@ -475,7 +475,7 @@ func (ctrl *Controller) drainNode(node *corev1.Node, drainer *drain.Helper) erro
 		ctrl.featureGatesAccessor,
 	)
 	if err != nil {
-		klog.Errorf("Error making MCN for Drain success: %w", err)
+		klog.Errorf("Error making MCN for Drain success: %v", err)
 	}
 
 	// Drain was successful. Delete the ongoing drain.

pkg/controller/machine-set-boot-image/machine_set_boot_image_controller.go

@@ -232,7 +232,7 @@ func (ctrl *Controller) addMachineSet(obj interface{}) {
 	// this.
 	err := ctrl.enqueueAllMachineSets()
 	if err != nil {
-		klog.Errorf("Error enqueuing all machine sets: %w", err)
+		klog.Errorf("Error enqueuing all machine sets: %v", err)
 	}
 }
 
@@ -252,7 +252,7 @@ func (ctrl *Controller) updateMachineSet(old, _ interface{}) {
 	// this.
 	err := ctrl.enqueueAllMachineSets()
 	if err != nil {
-		klog.Errorf("Error enqueuing all machine sets: %w", err)
+		klog.Errorf("Error enqueuing all machine sets: %v", err)
 	}
 }
 
@@ -274,7 +274,7 @@ func (ctrl *Controller) addConfigMap(obj interface{}) {
 	// Update all machine sets since the "golden" configmap has been updated
 	err := ctrl.enqueueAllMachineSets()
 	if err != nil {
-		klog.Errorf("Error enqueuing all machine sets: %w", err)
+		klog.Errorf("Error enqueuing all machine sets: %v", err)
 	}
 }
 

pkg/controller/node/status.go

@@ -42,12 +42,12 @@ func (ctrl *Controller) syncStatusOnly(pool *mcfgv1.MachineConfigPool) error {
 		}
 	}
 	if err != nil {
-		klog.Errorf("Could not get FG: %w", err)
+		klog.Errorf("Could not get FG: %v", err)
 	} else if mcnExists && fg.Enabled(configv1.FeatureGateMachineConfigNodes) {
 		for _, node := range nodes {
 			ms, err := ctrl.client.MachineconfigurationV1alpha1().MachineConfigNodes().Get(context.TODO(), node.Name, metav1.GetOptions{})
 			if err != nil {
-				klog.Errorf("Could not find our MachineConfigNode for node. %s: %w", node.Name, err)
+				klog.Errorf("Could not find our MachineConfigNode for node. %s: %v", node.Name, err)
 				continue
 			}
 			machineConfigStates = append(machineConfigStates, ms)

pkg/controller/render/render_controller.go

@@ -436,7 +436,7 @@ func (ctrl *Controller) syncMachineConfigPool(key string) error {
 	}
 
 	if err := ctrl.syncGeneratedMachineConfig(pool, mcs); err != nil {
-		klog.Errorf("Error syncing Generated MCFG: %w", err)
+		klog.Errorf("Error syncing Generated MCFG: %v", err)
 		return ctrl.syncFailingStatus(pool, err)
 	}
 	return ctrl.syncAvailableStatus(pool)

pkg/daemon/daemon.go

@@ -680,13 +680,13 @@ func (dn *Daemon) syncNode(key string) error {
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Rebooted: %w", err)
+			klog.Errorf("Error making MCN for Rebooted: %v", err)
 		}
 		removeRebooting := make(map[string]string)
 		removeRebooting[constants.MachineConfigDaemonPostConfigAction] = ""
 		_, err = dn.nodeWriter.SetAnnotations(removeRebooting)
 		if err != nil {
-			klog.Errorf("Could not unset rebooting Anno: %w", err)
+			klog.Errorf("Could not unset rebooting Anno: %v", err)
 		}
 	}
 
@@ -746,7 +746,7 @@ func (dn *Daemon) syncNode(key string) error {
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Resumed true: %w", err)
+			klog.Errorf("Error making MCN for Resumed true: %v", err)
 		}
 		removeRebooting := make(map[string]string)
 		removeRebooting[constants.MachineConfigDaemonReasonAnnotationKey] = ""
@@ -783,7 +783,7 @@ func (dn *Daemon) syncNode(key string) error {
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Updated false: %w", err)
+			klog.Errorf("Error making MCN for Updated false: %v", err)
 		}
 
 		// Only check for config drift if we need to update.
@@ -805,7 +805,7 @@ func (dn *Daemon) syncNode(key string) error {
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Updated: %w", err)
+			klog.Errorf("Error making MCN for Updated: %v", err)
 		}
 	}
 	klog.V(2).Infof("Node %s is already synced", node.Name)
@@ -1773,7 +1773,7 @@ func PersistNetworkInterfaces(osRoot string) error {
 			// nmstatectl clean up will fail if stamp file not
 			// found or `ROOT/etc/systemd/network` folder not
 			// found, these error is OK to ignore
-			klog.Infof("Cleanup error ignored: %w", err)
+			klog.Infof("Cleanup error ignored: %v", err)
 			return nil
 		}
 		return fmt.Errorf("failed to run nmstatectl: %w", err)
@@ -2058,7 +2058,7 @@ func (dn *Daemon) updateConfigAndState(state *stateAndConfigs) (bool, bool, erro
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Resumed true: %w", err)
+			klog.Errorf("Error making MCN for Resumed true: %v", err)
 		}
 		klog.Infof("Completing update to target %s", state.getCurrentName())
 		if err := dn.completeUpdate(state.currentConfig.GetName()); err != nil {

pkg/daemon/drain.go

@@ -46,7 +46,7 @@ func (dn *Daemon) performDrain() error {
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Drain not required: %w", err)
+			klog.Errorf("Error making MCN for Drain not required: %v", err)
 		}
 		dn.nodeWriter.Eventf(corev1.EventTypeNormal, "Drain", "Drain not required, skipping")
 		return nil

pkg/daemon/image-inspect.go

@@ -48,7 +48,7 @@ func imageInspect(imageName string) (*types.ImageInspectInfo, *digest.Digest, er
 		err        error
 	)
 
-	retryOpts := retry.Options{
+	retryOpts := retry.RetryOptions{
 		MaxRetry: cmdRetriesCount,
 	}
 
@@ -57,15 +57,15 @@ func imageInspect(imageName string) (*types.ImageInspectInfo, *digest.Digest, er
 
 	// retry.IfNecessary takes into account whether the error is "retryable"
 	// so we don't keep looping on errors that will never resolve
-	if err := retry.IfNecessary(ctx, func() error {
+	if err := retry.RetryIfNecessary(ctx, func() error {
 		src, err = newDockerImageSource(ctx, sys, imageName)
 		return err
 	}, &retryOpts); err != nil {
 		return nil, nil, fmt.Errorf("error parsing image name %q: %w", imageName, err)
 	}
 
 	var rawManifest []byte
-	if err := retry.IfNecessary(ctx, func() error {
+	if err := retry.RetryIfNecessary(ctx, func() error {
 		rawManifest, _, err = src.GetManifest(ctx, nil)
 
 		return err
@@ -86,7 +86,7 @@ func imageInspect(imageName string) (*types.ImageInspectInfo, *digest.Digest, er
 		return nil, nil, fmt.Errorf("error parsing manifest for image %q: %w", imageName, err)
 	}
 
-	if err := retry.IfNecessary(ctx, func() error {
+	if err := retry.RetryIfNecessary(ctx, func() error {
 		imgInspect, err = img.Inspect(ctx)
 		return err
 	}, &retryOpts); err != nil {

pkg/daemon/rpm-ostree.go

@@ -99,7 +99,7 @@ func (r *RpmOstreeClient) Initialize() error {
 
 	err := useMergedPullSecrets()
 	if err != nil {
-		klog.Errorf("error while linking rpm-ostree pull secrets %w", err)
+		klog.Errorf("error while linking rpm-ostree pull secrets %v", err)
 	}
 
 	return nil

pkg/daemon/update.go

@@ -94,7 +94,7 @@ func (dn *Daemon) performPostConfigChangeAction(postConfigChangeActions []string
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for rebooting: %w", err)
+			klog.Errorf("Error making MCN for rebooting: %v", err)
 		}
 		logSystem("Rebooting node")
 		return dn.reboot(fmt.Sprintf("Node will reboot into config %s", configName))
@@ -114,7 +114,7 @@ func (dn *Daemon) performPostConfigChangeAction(postConfigChangeActions []string
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for no post config change action: %w", err)
+			klog.Errorf("Error making MCN for no post config change action: %v", err)
 		}
 		logSystem("Node has Desired Config %s, skipping reboot", configName)
 	}
@@ -139,7 +139,7 @@ func (dn *Daemon) performPostConfigChangeAction(postConfigChangeActions []string
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Reloading success: %w", err)
+			klog.Errorf("Error making MCN for Reloading success: %v", err)
 		}
 
 		if dn.nodeWriter != nil {
@@ -685,7 +685,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 			dn.featureGatesAccessor,
 		)
 		if Nerr != nil {
-			klog.Errorf("Error making MCN for Preparing update failed: %w", err)
+			klog.Errorf("Error making MCN for Preparing update failed: %v", err)
 		}
 		wrappedErr := fmt.Errorf("can't reconcile config %s with %s: %w", oldConfigName, newConfigName, reconcilableError)
 		if dn.nodeWriter != nil {
@@ -709,7 +709,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 			dn.featureGatesAccessor,
 		)
 		if Nerr != nil {
-			klog.Errorf("Error making MCN for Preparing update failed: %w", err)
+			klog.Errorf("Error making MCN for Preparing update failed: %v", err)
 		}
 		return err
 	}
@@ -729,7 +729,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 		dn.featureGatesAccessor,
 	)
 	if err != nil {
-		klog.Errorf("Error making MCN for Update Compatible: %w", err)
+		klog.Errorf("Error making MCN for Update Compatible: %v", err)
 	}
 	pool := ""
 	var ok bool
@@ -743,7 +743,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 
 	err = upgrademonitor.GenerateAndApplyMachineConfigNodeSpec(dn.featureGatesAccessor, pool, dn.node, dn.mcfgClient)
 	if err != nil {
-		klog.Errorf("Error making MCN spec for Update Compatible: %w", err)
+		klog.Errorf("Error making MCN spec for Update Compatible: %v", err)
 	}
 	if drain {
 		if err := dn.performDrain(); err != nil {
@@ -761,7 +761,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 			dn.featureGatesAccessor,
 		)
 		if err != nil {
-			klog.Errorf("Error making MCN for Drain not required: %w", err)
+			klog.Errorf("Error making MCN for Drain not required: %v", err)
 		}
 	}
 
@@ -788,7 +788,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 		dn.featureGatesAccessor,
 	)
 	if err != nil {
-		klog.Errorf("Error making MCN for Updating Files and OS: %w", err)
+		klog.Errorf("Error making MCN for Updating Files and OS: %v", err)
 	}
 
 	// update files on disk that need updating
@@ -900,7 +900,7 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig, skipCertifi
 		dn.featureGatesAccessor,
 	)
 	if err != nil {
-		klog.Errorf("Error making MCN for Updated Files and OS: %w", err)
+		klog.Errorf("Error making MCN for Updated Files and OS: %v", err)
 	}
 
 	err = dn.performPostConfigChangeAction(actions, newConfig.GetName())
@@ -2386,7 +2386,7 @@ func (dn *Daemon) reboot(rationale string) error {
 		Rebooting[constants.MachineConfigDaemonPostConfigAction] = constants.MachineConfigDaemonStateRebooting
 		_, err := dn.nodeWriter.SetAnnotations(Rebooting)
 		if err != nil {
-			klog.Errorf("Error setting post config action annotation %w", err)
+			klog.Errorf("Error setting post config action annotation %v", err)
 		}
 	}
 

pkg/operator/operator.go

@@ -191,11 +191,11 @@ func New(
 
 	err := corev1.AddToScheme(scheme.Scheme)
 	if err != nil {
-		klog.Errorf("Could not modify scheme: %w", err)
+		klog.Errorf("Could not modify scheme: %v", err)
 	}
 	err = opv1.AddToScheme(scheme.Scheme)
 	if err != nil {
-		klog.Errorf("Could not modify scheme: %w", err)
+		klog.Errorf("Could not modify scheme: %v", err)
 	}
 
 	for _, i := range []cache.SharedIndexInformer{