Merge pull request #1847 from kube-logging/release-4.10

Forward port changes from release 4.10
kube-logging · Nov 11, 2024 · ef6f5b2 · ef6f5b2
2 parents da8532c + 14b7276
commit ef6f5b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pkg/resources/configcheck/configcheck.go b/pkg/resources/configcheck/configcheck.go
@@ -46,11 +46,12 @@ type ConfigCheckCleaner struct {
 	labels client.MatchingLabels
 }
 
-func NewConfigCheckCleaner(c client.Client, component string) *ConfigCheckCleaner {
+func NewConfigCheckCleaner(c client.Client, component string, logging string) *ConfigCheckCleaner {
 	return &ConfigCheckCleaner{
 		client: c,
 		labels: client.MatchingLabels{
-			"app.kubernetes.io/component": component,
+			"app.kubernetes.io/component":  component,
+			"app.kubernetes.io/managed-by": logging,
 		},
 	}
 }

diff --git a/pkg/resources/fluentd/fluentd.go b/pkg/resources/fluentd/fluentd.go
@@ -168,7 +168,7 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 		}
 
 		if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok {
-			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck)
+			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck, r.Logging.GetName())
 
 			var cleanupErrs error
 			cleanupErrs = errors.Append(cleanupErrs, cleaner.SecretCleanup(ctx, hash))

diff --git a/pkg/resources/syslogng/syslogng.go b/pkg/resources/syslogng/syslogng.go
@@ -142,7 +142,7 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 
 		// Cleanup previous configcheck results
 		if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok {
-			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck)
+			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck, r.Logging.GetName())
 
 			var cleanupErrs error
 			cleanupErrs = errors.Append(cleanupErrs, cleaner.SecretCleanup(ctx, hash))