Merge branch 'master' into opent

Signed-off-by: Jaydipkumar Arvindbhai Gabani <[email protected]>
JaydipGabani · Oct 26, 2023 · 418eac3 · 418eac3
2 parents 373c1e7 + 3a83700
commit 418eac3
Show file tree

Hide file tree

Showing 6 changed files with 334 additions and 303 deletions.
diff --git a/cmd/build/helmify/static/values.yaml b/cmd/build/helmify/static/values.yaml
@@ -210,6 +210,8 @@ controllerManager:
       #       cidr: 0.0.0.0/0
 audit:
   enablePubsub: false
+  connection: audit-connection
+  channel: audit-channel
   hostNetwork: false
   dnsPolicy: ClusterFirst
   metricsPort: 8888

diff --git a/manifest_staging/charts/gatekeeper/values.yaml b/manifest_staging/charts/gatekeeper/values.yaml
@@ -210,6 +210,8 @@ controllerManager:
       #       cidr: 0.0.0.0/0
 audit:
   enablePubsub: false
+  connection: audit-connection
+  channel: audit-channel
   hostNetwork: false
   dnsPolicy: ClusterFirst
   metricsPort: 8888

diff --git a/test/pubsub/fake-subscriber/main.go b/test/pubsub/fake-subscriber/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"log"
+	"os"
 	"strconv"
 
 	"github.com/dapr/go-sdk/service/common"
@@ -30,15 +31,18 @@ type PubsubMsg struct {
 	ResourceLabels        map[string]string `json:"resourceLabels,omitempty"`
 }
 
-var sub = &common.Subscription{
-	PubsubName: "pubsub",
-	Topic:      "audit",
-	Route:      "/checkout",
-}
-
 func main() {
+	auditChannel := os.Getenv("AUDIT_CHANNEL")
+	if auditChannel == "" {
+		auditChannel = "audit-channel"
+	}
+	sub := &common.Subscription{
+		PubsubName: "pubsub",
+		Topic:      auditChannel,
+		Route:      "/checkout",
+	}
 	s := daprd.NewService(":6002")
-	log.Printf("Listening...")
+	log.Printf("Listening on %s...", auditChannel)
 	if err := s.AddTopicEventHandler(sub, eventHandler); err != nil {
 		log.Fatalf("error adding topic subscription: %v", err)
 	}

diff --git a/test/pubsub/fake-subscriber/manifest/subscriber.yaml b/test/pubsub/fake-subscriber/manifest/subscriber.yaml
@@ -41,3 +41,6 @@ spec:
       - name: go-sub
         image: fake-subscriber:latest
         imagePullPolicy: Never
+        env:
+        - name: AUDIT_CHANNEL
+          value: "audit-channel"