Fix configmap watcher update issue

Author: savitaashture

cmd/pipelines-as-code-controller/main.go

@@ -28,16 +28,5 @@ func main() {
 		log.Fatal("failed to init kinit client : ", err)
 	}
 
-	c := make(chan struct{})
-	go func() {
-		log.Println("started goroutine to watch configmap changes for controller")
-		c <- struct{}{}
-		if err := run.WatchConfigMapChanges(ctx); err != nil {
-			log.Fatal("error from WatchConfigMapChanges for controller : ", err)
-		}
-	}()
-	// Force WatchConfigMapChanges go routines to actually start
-	<-c
-
 	evadapter.MainWithContext(ctx, PACControllerLogKey, adapter.NewEnvConfig, adapter.New(run, kinteract))
 }

pkg/adapter/adapter.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"os"
 	"time"
@@ -59,7 +60,7 @@ func New(run *params.Run, k *kubeinteraction.Interaction) adapter.AdapterConstru
 	}
 }
 
-func (l *listener) Start(_ context.Context) error {
+func (l *listener) Start(ctx context.Context) error {
 	adapterPort := globalAdapterPort
 	envAdapterPort := os.Getenv("PAC_CONTROLLER_PORT")
 	if envAdapterPort != "" {
@@ -75,7 +76,7 @@ func (l *listener) Start(_ context.Context) error {
 		_, _ = fmt.Fprint(w, "ok")
 	})
 
-	mux.HandleFunc("/", l.handleEvent())
+	mux.HandleFunc("/", l.handleEvent(ctx))
 
 	//nolint: gosec
 	srv := &http.Server{
@@ -97,9 +98,17 @@ func (l *listener) Start(_ context.Context) error {
 	return nil
 }
 
-func (l listener) handleEvent() http.HandlerFunc {
+func (l listener) handleEvent(ctx context.Context) http.HandlerFunc {
 	return func(response http.ResponseWriter, request *http.Request) {
-		ctx := context.Background()
+		c := make(chan struct{})
+		go func() {
+			c <- struct{}{}
+			if err := l.run.WatchConfigMapChanges(ctx); err != nil {
+				log.Fatal("error from WatchConfigMapChanges for controller : ", err)
+			}
+		}()
+		// Force WatchConfigMapChanges go routines to actually start
+		<-c
 
 		if request.Method != http.MethodPost {
 			l.writeResponse(response, http.StatusOK, "ok")

pkg/adapter/adapter_test.go

@@ -24,10 +24,13 @@ func TestHandleEvent(t *testing.T) {
 	cs, _ := testclient.SeedTestData(t, ctx, testclient.Data{})
 	logger, _ := logger.GetLogger()
 
+	t.Setenv("SYSTEM_NAMESPACE", "test")
 	l := listener{
 		run: &params.Run{
 			Clients: clients.Clients{
 				PipelineAsCode: cs.PipelineAsCode,
+				Log:            logger,
+				Kube:           cs.Kube,
 			},
 			Info: info.Info{
 				Pac: &info.PacOpts{
@@ -40,7 +43,7 @@ func TestHandleEvent(t *testing.T) {
 		logger: logger,
 	}
 
-	ts := httptest.NewServer(l.handleEvent())
+	ts := httptest.NewServer(l.handleEvent(ctx))
 	defer ts.Close()
 
 	// valid push event

pkg/params/run.go

@@ -39,7 +39,6 @@ func StringToBool(s string) bool {
 
 // WatchConfigMapChanges watches for provide configmap
 func (r *Run) WatchConfigMapChanges(ctx context.Context) error {
-	r.Clients.Log.Info("Inside WatchConfigMapChanges function")
 	ns := os.Getenv("SYSTEM_NAMESPACE")
 	if ns == "" {
 		return fmt.Errorf("failed to find pipelines-as-code installation namespace")

pkg/reconciler/controller.go

@@ -36,10 +36,9 @@ func NewController() func(context.Context, configmap.Watcher) *controller.Impl {
 
 		c := make(chan struct{})
 		go func() {
-			log.Println("started goroutine to watch configmap changes inside controller reconciler")
 			c <- struct{}{}
 			if err := run.WatchConfigMapChanges(ctx); err != nil {
-				log.Fatal("error from WatchConfigMapChanges from controller reconciler : ", err)
+				log.Fatal("error from WatchConfigMapChanges from watcher reconciler : ", err)
 			}
 		}()
 		<-c