more formatting and fix test errors

Signed-off-by: Atif Ali <[email protected]>

Author: aali309

pkg/sync/sync_context.go

@@ -1081,6 +1081,10 @@ func (sc *syncContext) applyObject(t *syncTask, dryRun, validate bool) (common.R
 						currentVal, exists := currentSpec[k]
 						// Only add to changes if values are actually different
 						if !exists || !reflect.DeepEqual(currentVal, desiredVal) {
+							// Skip if the values are deeply equal (for complex types like volumeClaimTemplates)
+							if exists && reflect.DeepEqual(currentVal, desiredVal) {
+								continue
+							}
 							currentStr := formatValue(currentVal)
 							desiredStr := formatValue(desiredVal)
 							changes = append(changes, fmt.Sprintf("   - %s:\n      from: %s\n      to:   %s",
@@ -1090,11 +1094,13 @@ func (sc *syncContext) applyObject(t *syncTask, dryRun, validate bool) (common.R
 				}
 				if len(changes) > 0 {
 					sort.Strings(changes)
-					return common.ResultCodeSyncFailed, fmt.Sprintf("attempting to change immutable fields:\n%s\n\nForbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden",
+					message := fmt.Sprintf("attempting to change immutable fields:\n%s\n\nForbidden: updates to statefulset spec for fields other than 'replicas', 'ordinals', 'template', 'updateStrategy', 'persistentVolumeClaimRetentionPolicy' and 'minReadySeconds' are forbidden",
 						strings.Join(changes, "\n"))
+					return common.ResultCodeSyncFailed, message
 				}
 			}
 		}
+		// For all other errors, return the original error message
 		return common.ResultCodeSyncFailed, err.Error()
 	}
 	if kube.IsCRD(t.targetObj) && !dryRun {

pkg/sync/sync_context_test.go

@@ -2246,8 +2246,6 @@ Forbidden: updates to statefulset spec for fields other than 'replicas', 'ordina
 			sc.resourceOps = mockResourceOps
 
 			_, message := sc.applyObject(task, false, false)
-			t.Logf("+++Actual error message:\n%s", message)
-			t.Logf("+++Expected error message:\n%s", tt.expectedMessage)
 			assert.Equal(t, tt.expectedMessage, message)
 		})
 	}