Fix hashing bug (#2899)

* add default annotation filter to prevent unnecessary reconciliation

* oop

* chlog

* add comment

Author: jaronoff97

.chloggen/fix-hashing-bug.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
+component: collector
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fixes a bug that would cause errant rollouts on a non-config related change.
+
+# One or more tracking issues related to the change
+issues: [2899]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

internal/config/main.go

@@ -77,6 +77,7 @@ func New(opts ...Option) Config {
 		logger:                            logf.Log.WithName("config"),
 		version:                           version.Get(),
 		enableJavaInstrumentation:         true,
+		annotationsFilter:                 []string{"kubectl.kubernetes.io/last-applied-configuration"},
 	}
 	for _, opt := range opts {
 		opt(&o)

internal/config/options.go

@@ -223,10 +223,12 @@ func WithLabelFilters(labelFilters []string) Option {
 	}
 }
 
+// WithAnnotationFilters is additive if called multiple times. It works off of a few default filters
+// to prevent unnecessary rollouts. The defaults include the following:
+// * kubectl.kubernetes.io/last-applied-configuration.
 func WithAnnotationFilters(annotationFilters []string) Option {
 	return func(o *options) {
-
-		filters := []string{}
+		filters := o.annotationsFilter
 		for _, pattern := range annotationFilters {
 			var result strings.Builder
 

internal/manifests/manifestutils/labels.go

@@ -26,8 +26,9 @@ import (
 
 func IsFilteredSet(sourceSet string, filterSet []string) bool {
 	for _, pattern := range filterSet {
-		match, _ := regexp.MatchString(pattern, sourceSet)
-		return match
+		if match, _ := regexp.MatchString(pattern, sourceSet); match {
+			return match
+		}
 	}
 	return false
 }