normalize fields added by K8s that will cause a perpetual diff (#259)

KusionStack · Mar 2, 2023 · ff2f377 · ff2f377
1 parent 7ede4e1
commit ff2f377
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/pkg/engine/runtime/kubernetes/kubernetes_runtime.go b/pkg/engine/runtime/kubernetes/kubernetes_runtime.go
@@ -234,13 +234,7 @@ func (k *KubernetesRuntime) Import(ctx context.Context, request *runtime.ImportR
 				}
 			}
 		}
-
-		const metadata = "metadata"
-		unstructured.RemoveNestedField(ur.Object, "status")
-		unstructured.RemoveNestedField(ur.Object, metadata, "resourceVersion")
-		unstructured.RemoveNestedField(ur.Object, metadata, "creationTimestamp")
-		unstructured.RemoveNestedField(ur.Object, metadata, "selfLink")
-		unstructured.RemoveNestedField(ur.Object, metadata, "uid")
+		normalizeServerSideFields(ur)
 	}
 	response.Resource.Attributes = ur.Object
 	return &runtime.ImportResponse{
@@ -249,6 +243,18 @@ func (k *KubernetesRuntime) Import(ctx context.Context, request *runtime.ImportR
 	}
 }
 
+// normalize fields added by K8s that will cause a perpetual diff
+func normalizeServerSideFields(ur *unstructured.Unstructured) {
+	const metadata = "metadata"
+	unstructured.RemoveNestedField(ur.Object, "status")
+	unstructured.RemoveNestedField(ur.Object, metadata, "resourceVersion")
+	unstructured.RemoveNestedField(ur.Object, metadata, "creationTimestamp")
+	unstructured.RemoveNestedField(ur.Object, metadata, "selfLink")
+	unstructured.RemoveNestedField(ur.Object, metadata, "uid")
+	unstructured.RemoveNestedField(ur.Object, metadata, "generation")
+	unstructured.RemoveNestedField(ur.Object, metadata, "managedFields")
+}
+
 func normalizeService(ur *unstructured.Unstructured) error {
 	target := &corev1.Service{}
 	if err := k8sruntime.DefaultUnstructuredConverter.FromUnstructured(ur.Object, target); err != nil {