don't apply when there are no changes

edgelesssys · Nov 23, 2023 · 639b036 · 639b036
1 parent eb57753
commit 639b036
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/kubecmd/kubecmd.go b/internal/kubecmd/kubecmd.go
@@ -130,6 +130,7 @@ func (k *KubeCmd) UpgradeNodeVersion(ctx context.Context, conf *config.Config, f
 			return fmt.Errorf("updating image version: %w", err)
 		}
 
+		// TODO(3u13r): remove `reconcileKubeadmConfigMap` after v2.14.0 has been released.
 		if err := k.reconcileKubeadmConfigMap(ctx); err != nil {
 			return fmt.Errorf("reconciling kubeadm config: %w", err)
 		}
@@ -422,6 +423,11 @@ func (k *KubeCmd) reconcileKubeadmConfigMap(ctx context.Context) error {
 		return fmt.Errorf("marshaling ClusterConfiguration: %w", err)
 	}
 
+	if kubeadmConfig.Data[constants.ClusterConfigurationKey] == string(newConfigYAML) {
+		k.log.Debugf("No changes to kubeadm config required")
+		return nil
+	}
+
 	kubeadmConfig.Data[constants.ClusterConfigurationKey] = string(newConfigYAML)
 	k.log.Debugf("Triggering kubeadm config update now")
 	if _, err = k.kubectl.UpdateConfigMap(ctx, kubeadmConfig); err != nil {