Merge pull request #1095 from gianlucam76/flux-sources-changes

gianlucam76 · web-flow · commit de596873238a · 2025-03-13T17:08:18.000+01:00
(bug) Flux Source Artifact changes
diff --git a/controllers/clustersummary_predicates.go b/controllers/clustersummary_predicates.go
@@ -275,6 +275,7 @@ func fluxGenericPredicate(obj client.Object, logger logr.Logger) bool {
 }
 
 func hasArtifactChanged(objNew, objOld client.Object) bool {
+	addTypeInformationToObject(getManagementClusterClient().Scheme(), objNew)
 	switch objNew.GetObjectKind().GroupVersionKind().Kind {
 	case sourcev1.GitRepositoryKind:
 		newGitRepo := objNew.(*sourcev1.GitRepository)
@@ -312,5 +313,5 @@ func isArtifactSame(oldArtifact, newArtifact *sourcev1.Artifact) bool {
 	if oldArtifact != nil && newArtifact == nil {
 		return false
 	}
-	return reflect.DeepEqual(oldArtifact, newArtifact)
+	return reflect.DeepEqual(oldArtifact.Digest, newArtifact.Digest)
 }

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ func fluxGenericPredicate(obj client.Object, logger logr.Logger) bool {`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`func hasArtifactChanged(objNew, objOld client.Object) bool {`
	`278`	`+ addTypeInformationToObject(getManagementClusterClient().Scheme(), objNew)`
`278`	`279`	`switch objNew.GetObjectKind().GroupVersionKind().Kind {`
`279`	`280`	`case sourcev1.GitRepositoryKind:`
`280`	`281`	`newGitRepo := objNew.(*sourcev1.GitRepository)`
`@@ -312,5 +313,5 @@ func isArtifactSame(oldArtifact, newArtifact *sourcev1.Artifact) bool {`
`312`	`313`	`if oldArtifact != nil && newArtifact == nil {`
`313`	`314`	`return false`
`314`	`315`	`}`
`315`		`- return reflect.DeepEqual(oldArtifact, newArtifact)`
	`316`	`+ return reflect.DeepEqual(oldArtifact.Digest, newArtifact.Digest)`
`316`	`317`	`}`