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

pepov · web-flow · commit ef6f5b2dca11 · 2024-11-11T14:05:18.000+01:00
Forward port changes from release 4.10
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))

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,12 @@ type ConfigCheckCleaner struct {`
`46`	`46`	`labels client.MatchingLabels`
`47`	`47`	`}`
`48`	`48`
`49`		`-func NewConfigCheckCleaner(c client.Client, component string) *ConfigCheckCleaner {`
	`49`	`+func NewConfigCheckCleaner(c client.Client, component string, logging string) *ConfigCheckCleaner {`
`50`	`50`	`return &ConfigCheckCleaner{`
`51`	`51`	`client: c,`
`52`	`52`	`labels: client.MatchingLabels{`
`53`		`- "app.kubernetes.io/component": component,`
	`53`	`+ "app.kubernetes.io/component": component,`
	`54`	`+ "app.kubernetes.io/managed-by": logging,`
`54`	`55`	`},`
`55`	`56`	`}`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func (r Reconciler) Reconcile(ctx context.Context) (reconcile.Result, error) {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok {`
`171`		`- cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck)`
	`171`	`+ cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck, r.Logging.GetName())`
`172`	`172`
`173`	`173`	`var cleanupErrs error`
`174`	`174`	`cleanupErrs = errors.Append(cleanupErrs, cleaner.SecretCleanup(ctx, hash))`