rebase to main

Signed-off-by: Frank Jogeleit <[email protected]>
kyverno · Sep 1, 2024 · 6a7c3a2 · 6a7c3a2
1 parent 007a9ca
commit 6a7c3a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/target/factory/factory.go b/pkg/target/factory/factory.go
@@ -782,6 +782,8 @@ func (f *TargetFactory) mapSecretValues(config any, ref, mountedSecret string) {
 	case *target.Config[target.SlackOptions]:
 		if values.Webhook != "" {
 			c.Config.Webhook = values.Webhook
+		}
+		if values.Channel != "" {
 			c.Config.Channel = values.Channel
 		}
 

diff --git a/pkg/target/slack/slack.go b/pkg/target/slack/slack.go
@@ -47,6 +47,10 @@ func (s *client) message(result v1alpha2.PolicyReportResult) *slack.WebhookMessa
 		Channel:     s.channel,
 	}
 
+	if s.channel != "" {
+		p.Channel = s.channel
+	}
+
 	att := slack.Attachment{
 		Color: colors[result.Priority],
 		Blocks: slack.Blocks{
@@ -178,6 +182,10 @@ func (s *client) batchMessage(polr v1alpha2.ReportInterface, results []v1alpha2.
 		Channel:     s.channel,
 	}
 
+	if s.channel != "" {
+		p.Channel = s.channel
+	}
+
 	att := slack.Attachment{
 		Color: colors[v1alpha2.InfoPriority],
 		Blocks: slack.Blocks{