chore: Clean-up watcher handler client (#519)

* chore: Clean-up watcher handler client

* bump klm and listener deps

Author: lindnerby

runtime-watcher/go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/uuid v1.6.0
-	github.com/kyma-project/lifecycle-manager/api v0.0.0-20250110082954-314c5d928b9c
-	github.com/kyma-project/runtime-watcher/listener v0.0.0-20241016074354-1202c46411f6
+	github.com/kyma-project/lifecycle-manager/api v0.0.0-20250318075553-30eaaad97ff1
+	github.com/kyma-project/runtime-watcher/listener v0.0.0-20250317130058-42ef0a646046
 	github.com/onsi/ginkgo/v2 v2.23.0
 	github.com/onsi/gomega v1.36.2
 	github.com/prometheus/client_golang v1.21.1

runtime-watcher/go.sum

@@ -62,10 +62,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/kyma-project/lifecycle-manager/api v0.0.0-20250110082954-314c5d928b9c h1:Oai1Ot8D+K+zWCI3+wcI+o4PbO494eu30c1VAg2WWjg=
-github.com/kyma-project/lifecycle-manager/api v0.0.0-20250110082954-314c5d928b9c/go.mod h1:flQzAJyHCHjie+EIY7CA+Z4kmRA72GiMRZqKE2xnoq8=
-github.com/kyma-project/runtime-watcher/listener v0.0.0-20241016074354-1202c46411f6 h1:lQ4J8KeqUDCJY/e0cd9p1uQxySPVDB6lza+rRjIrJ/8=
-github.com/kyma-project/runtime-watcher/listener v0.0.0-20241016074354-1202c46411f6/go.mod h1:DbPx0iy1Xdu1NhFxvWcKoUHYRjmvnP4yzSxF5g4z1rw=
+github.com/kyma-project/lifecycle-manager/api v0.0.0-20250318075553-30eaaad97ff1 h1:9vHmPoYn6fxhIVdBrRP2iqUrjTbLXyeTCFOUL1z5Fns=
+github.com/kyma-project/lifecycle-manager/api v0.0.0-20250318075553-30eaaad97ff1/go.mod h1:OPHMLeB0fYVzd6GNnbmJmJFIL45IECO4zedNAPPnnpM=
+github.com/kyma-project/runtime-watcher/listener v0.0.0-20250317130058-42ef0a646046 h1:03g/tseSGYf0Ob1ZP4qLHxHyqxBEFT0NjVP5frduRGE=
+github.com/kyma-project/runtime-watcher/listener v0.0.0-20250317130058-42ef0a646046/go.mod h1:JTkqD1px7OKETXWbXvBqGcZoaKw96S3J+6t/TlKFfNM=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

runtime-watcher/internal/handler.go

@@ -41,14 +41,12 @@ const (
 	namespaceNameEntityCount = 2
 )
 
-func NewHandler(client client.Client,
-	logger logr.Logger,
+func NewHandler(logger logr.Logger,
 	config serverconfig.ServerConfig,
 	parser requestparser.RequestParser,
 	metrics watchermetrics.WatcherMetrics,
 ) *Handler {
 	return &Handler{
-		client:        client,
 		logger:        logger,
 		config:        config,
 		requestParser: parser,
@@ -57,7 +55,6 @@ func NewHandler(client client.Client,
 }
 
 type Handler struct {
-	client        client.Client
 	logger        logr.Logger
 	config        serverconfig.ServerConfig
 	requestParser requestparser.RequestParser

runtime-watcher/internal/handler_suite_test.go

@@ -13,7 +13,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -30,7 +29,6 @@ var (
 	kcpRecorder   *httptest.ResponseRecorder
 	kcpMockServer *httptest.Server
 	testEnv       *envtest.Environment
-	k8sClient     client.Client
 	certProvider  tlstest.CertProvider
 )
 
@@ -52,10 +50,6 @@ var _ = BeforeSuite(func() {
 
 	Expect(err).NotTo(HaveOccurred())
 
-	k8sClient, err = client.New(cfg, client.Options{})
-	Expect(err).NotTo(HaveOccurred())
-	Expect(k8sClient).NotTo(BeNil())
-
 	kcpTestHandler := BootStrapKcpMockHandlers(moduleName)
 	kcpRecorder = kcpTestHandler.Recorder
 

runtime-watcher/internal/handler_test.go

@@ -109,7 +109,7 @@ var _ = Describe("given watched resource", Ordered, func() {
 		decoder := serializer.NewCodecFactory(runtime.NewScheme()).UniversalDeserializer()
 		requestParser := requestparser.NewRequestParser(decoder)
 		metrics := watchermetrics.NewMetrics()
-		handler := internal.NewHandler(k8sClient, logger, config, *requestParser, *metrics)
+		handler := internal.NewHandler(logger, config, *requestParser, *metrics)
 		skrRecorder := httptest.NewRecorder()
 		handler.Handle(skrRecorder, request)
 

runtime-watcher/main.go

@@ -28,7 +28,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/kyma-project/runtime-watcher/skr/internal"
@@ -68,14 +67,6 @@ func main() {
 	}
 	logger.Info("Server config successfully parsed: " + config.PrettyPrint())
 
-	restConfig := ctrl.GetConfigOrDie()
-	restClient, err := client.New(restConfig, client.Options{})
-	if err != nil {
-		logger.Error(err, "rest client could not be determined for skr-webhook")
-		return
-	}
-	logger.Info("REST client initialized")
-
 	decoder := serializer.NewCodecFactory(runtime.NewScheme()).UniversalDeserializer()
 	requestParser := requestparser.NewRequestParser(decoder)
 	metrics := watchermetrics.NewMetrics()
@@ -95,7 +86,7 @@ func main() {
 	}()
 	logger.Info("Metrics server started")
 
-	handler := internal.NewHandler(restClient, logger, config, *requestParser, *metrics)
+	handler := internal.NewHandler(logger, config, *requestParser, *metrics)
 	http.HandleFunc("/validate/", handler.Handle)
 	server := http.Server{
 		Addr:        fmt.Sprintf(":%d", config.Port),

runtime-watcher/tests/e2e/utils/utils.go

@@ -38,7 +38,6 @@ func NewKyma(name, namespace, channel string) *v1beta2.Kyma {
 			},
 			Labels: map[string]string{
 				shared.InstanceIDLabel: instanceIDLabelValue,
-				shared.SyncLabel:       shared.EnableLabelValue,
 			},
 		},
 		Spec: v1beta2.KymaSpec{