yoke: make turbulence less senstive to metadata properties

Author: davidmdm

Diff for: cmd/atc/handler.go

@@ -291,7 +291,7 @@ func Handler(client *k8s.Client, cache *wasm.ModuleCache, controllers *atc.Contr
 			return
 		}
 
-		if next != nil && ctrl.ResourcesAreEqual(prev, next) {
+		if next != nil && internal.ResourcesAreEqual(prev, next) {
 			addRequestAttrs(r.Context(), slog.String("skipReason", "resources are equal"))
 			return
 		}
@@ -378,7 +378,7 @@ func Handler(client *k8s.Client, cache *wasm.ModuleCache, controllers *atc.Contr
 
 			internal.RemoveAdditions(desired, next)
 
-			if !ctrl.ResourcesAreEqual(desired, next) {
+			if !internal.ResourcesAreEqual(desired, next) {
 				review.Response.Allowed = false
 				review.Response.Result = &metav1.Status{
 					Message: "cannot modify flight sub-resources",

Diff for: cmd/yoke/cmd_turbulence.go

@@ -37,6 +37,7 @@ func GetTurbulenceParams(settings GlobalSettings, args []string) (*TurbulencePar
 	params := TurbulenceParams{GlobalSettings: settings}
 
 	RegisterGlobalFlags(flagset, &params.GlobalSettings)
+
 	flagset.IntVar(&params.Context, "context", 4, "number of lines of context in diff")
 	flagset.BoolVar(
 		&params.ConflictsOnly,

Diff for: internal/k8s/ctrl/controller.go

@@ -23,6 +23,7 @@ import (
 	kcache "k8s.io/client-go/tools/cache"
 	retryWatcher "k8s.io/client-go/tools/watch"
 
+	"github.com/yokecd/yoke/internal"
 	"github.com/yokecd/yoke/internal/k8s"
 	"github.com/yokecd/yoke/internal/xsync"
 )
@@ -287,7 +288,7 @@ func (ctrl *Instance) eventsFromMetaGetter(ctx context.Context, getter metadata.
 					if err == nil {
 						prev := cache[evt]
 						cache[evt] = current
-						if ResourcesAreEqual(prev, current) {
+						if internal.ResourcesAreEqual(prev, current) {
 							continue
 						}
 					}
@@ -355,26 +356,6 @@ func withJitter(duration time.Duration, percent float64) time.Duration {
 	return time.Duration(float64(duration) - offset + jitter).Round(time.Second)
 }
 
-func ResourcesAreEqual(a, b *unstructured.Unstructured) bool {
-	if (a == nil) || (b == nil) {
-		return false
-	}
-
-	dropKeys := [][]string{
-		{"metadata", "generation"},
-		{"metadata", "resourceVersion"},
-		{"metadata", "managedFields"},
-		{"status"},
-	}
-
-	for _, keys := range dropKeys {
-		unstructured.RemoveNestedField(a.Object, keys...)
-		unstructured.RemoveNestedField(b.Object, keys...)
-	}
-
-	return reflect.DeepEqual(a.Object, b.Object)
-}
-
 func safe(handler HandleFunc) HandleFunc {
 	return func(ctx context.Context, event Event) (result Result, err error) {
 		defer func() {

Diff for: internal/revision.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/url"
 	"path"
-	"reflect"
 	"slices"
 	"strconv"
 	"strings"
@@ -125,36 +124,6 @@ func GetOwner(resource *unstructured.Unstructured) string {
 	return namespace + "/" + release
 }
 
-// RemoveAdditions removes fields from actual that are not in expected.
-// it removes the additional properties in place and returns "actual" back.
-// Values passed to removeAdditions are expected to be generic json compliant structures:
-// map[string]any, []any, or scalars.
-func RemoveAdditions[T any](expected, actual T) T {
-	// Check if we can access the types safely
-	if !reflect.ValueOf(expected).IsValid() || !reflect.ValueOf(actual).IsValid() || reflect.ValueOf(actual).Type() != reflect.ValueOf(expected).Type() {
-		return actual
-	}
-
-	switch a := any(actual).(type) {
-	case map[string]any:
-		e := any(expected).(map[string]any)
-		for key := range a {
-			if _, ok := e[key]; !ok {
-				delete(a, key)
-				continue
-			}
-			a[key] = RemoveAdditions(e[key], a[key])
-		}
-	case []any:
-		e := any(expected).([]any)
-		for i := range min(len(a), len(e)) {
-			a[i] = RemoveAdditions(e[i], a[i])
-		}
-	}
-
-	return actual
-}
-
 func Canonical(resource *unstructured.Unstructured) string {
 	gvk := resource.GetObjectKind().GroupVersionKind()
 

Diff for: internal/unstructured.go

@@ -2,6 +2,7 @@ package internal
 
 import (
 	"encoding/json"
+	"reflect"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
@@ -25,3 +26,65 @@ func MustUnstructuredObject(value any) map[string]any {
 	result, _ := UnstructuredObject(value)
 	return result
 }
+
+func ResourcesAreEqual(a, b *unstructured.Unstructured) bool {
+	if (a == nil) || (b == nil) {
+		return false
+	}
+
+	dropKeys := [][]string{
+		{"metadata", "generation"},
+		{"metadata", "resourceVersion"},
+		{"metadata", "managedFields"},
+		{"status"},
+	}
+
+	return reflect.DeepEqual(
+		DropProperties(a, dropKeys).Object,
+		DropProperties(b, dropKeys).Object,
+	)
+}
+
+func DropProperties(resource *unstructured.Unstructured, props [][]string) *unstructured.Unstructured {
+	if resource == nil {
+		return nil
+	}
+
+	resource = resource.DeepCopy()
+
+	for _, keys := range props {
+		unstructured.RemoveNestedField(resource.Object, keys...)
+	}
+
+	return resource
+}
+
+// RemoveAdditions removes fields from actual that are not in expected.
+// it removes the additional properties in place and returns "actual" back.
+// Values passed to removeAdditions are expected to be generic json compliant structures:
+// map[string]any, []any, or scalars.
+func RemoveAdditions[T any](expected, actual T) T {
+	// Check if we can access the types safely
+	if !reflect.ValueOf(expected).IsValid() || !reflect.ValueOf(actual).IsValid() || reflect.ValueOf(actual).Type() != reflect.ValueOf(expected).Type() {
+		return actual
+	}
+
+	switch a := any(actual).(type) {
+	case map[string]any:
+		e := any(expected).(map[string]any)
+		for key := range a {
+			if _, ok := e[key]; !ok {
+				delete(a, key)
+				continue
+			}
+			a[key] = RemoveAdditions(e[key], a[key])
+		}
+	case []any:
+		e := any(expected).([]any)
+		for i := range min(len(a), len(e)) {
+			a[i] = RemoveAdditions(e[i], a[i])
+		}
+	}
+
+	return actual
+}

Diff for: pkg/yoke/yoke.go

@@ -176,12 +176,22 @@ func (commander Commander) Turbulence(ctx context.Context, params TurbulencePara
 
 	expected := internal.CanonicalMap(stages.Flatten())
 
+	ignoredProps := [][]string{
+		{"metadata", "generation"},
+		{"metadata", "resourceVersion"},
+		{"metadata", "managedFields"},
+		{"metadata", "creationTimestamp"},
+		{"status"},
+	}
+
 	actual := map[string]*unstructured.Unstructured{}
 	for name, resource := range expected {
+		expected[name] = internal.DropProperties(resource, ignoredProps)
 		value, err := commander.k8s.GetInClusterState(ctx, resource)
 		if err != nil {
 			return fmt.Errorf("failed to get in cluster state for resource %s: %w", internal.Canonical(resource), err)
 		}
+		value = internal.DropProperties(value, ignoredProps)
 		if value != nil && params.ConflictsOnly {
 			value.Object = internal.RemoveAdditions(resource.Object, value.Object)
 		}