[release-v1.14] workaround DeepDerivative CreationTimestamp comparison (

#1305) * workaround DeepDerivative CreationTimestamp comparison * add patch for eventing_auth_serviceaccount_creationtimestamp.patch * add patch to generate-release
openshift-knative · Oct 8, 2024 · 6b5eeca · 6b5eeca
1 parent 9fb4274
commit 6b5eeca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/openshift/patches/eventing_auth_serviceaccount_creationtimestamp.patch b/openshift/patches/eventing_auth_serviceaccount_creationtimestamp.patch
@@ -0,0 +1,14 @@
+diff --git a/vendor/knative.dev/eventing/pkg/auth/serviceaccount.go b/vendor/knative.dev/eventing/pkg/auth/serviceaccount.go
+index 5b98d61c7..12e0fe130 100644
+--- a/vendor/knative.dev/eventing/pkg/auth/serviceaccount.go
++++ b/vendor/knative.dev/eventing/pkg/auth/serviceaccount.go
+@@ -109,6 +109,9 @@ func EnsureOIDCServiceAccountExistsForResource(ctx context.Context, serviceAccou
+ 		return fmt.Errorf("service account %s not owned by %s %s", sa.Name, gvk.Kind, objectMeta.Name)
+ 	}
+
++	// DeepDerivative does not understand default metav1.Time{} as an empty value
++	expected.CreationTimestamp = sa.CreationTimestamp
++
+ 	if !equality.Semantic.DeepDerivative(expected, sa) {
+ 		expected.ResourceVersion = sa.ResourceVersion
+
diff --git a/openshift/release/generate-release.sh b/openshift/release/generate-release.sh
@@ -7,6 +7,7 @@ source $(dirname $0)/resolve.sh
 GITHUB_ACTIONS=true $(dirname $0)/../../hack/update-codegen.sh
 git apply openshift/patches/refactor_newfilters.patch
 git apply openshift/patches/rekt-serviceaccounts-delete.patch
+git apply openshift/patches/eventing_auth_serviceaccount_creationtimestamp.patch
 
 # Eventing core will bring the config tracing ConfigMap, so remove it from heret
 rm -f control-plane/config/eventing-kafka-broker/200-controller/100-config-tracing.yaml

diff --git a/vendor/knative.dev/eventing/pkg/auth/serviceaccount.go b/vendor/knative.dev/eventing/pkg/auth/serviceaccount.go
@@ -109,6 +109,9 @@ func EnsureOIDCServiceAccountExistsForResource(ctx context.Context, serviceAccou
 		return fmt.Errorf("service account %s not owned by %s %s", sa.Name, gvk.Kind, objectMeta.Name)
 	}
 
+	// DeepDerivative does not understand default metav1.Time{} as an empty value
+	expected.CreationTimestamp = sa.CreationTimestamp
+
 	if !equality.Semantic.DeepDerivative(expected, sa) {
 		expected.ResourceVersion = sa.ResourceVersion