feat: Update to listener v1.4.0 and remove Owner field usage (#678)

- Update listener dependency from v1.3.0 to v1.4.0
- Remove Owner field from WatchEvent construction
- Remove extractOwner() function and related code
- Remove ownedBy annotation constant (no longer needed)
- Remove errNoOwner error
- Remove ReasonOwner metric constant
- Remove e2e test for owner annotation validation

This completes the removal of the deprecated Owner field from runtime-watcher.
The Owner field was removed from listener in v1.4.0 as part of architecture refactoring.

Part of #549

Author: medmes

runtime-watcher/go.mod

@@ -5,7 +5,7 @@ go 1.25.5
 require (
 	github.com/go-logr/logr v1.4.3
 	github.com/go-logr/zapr v1.3.0
-	github.com/kyma-project/runtime-watcher/listener v1.3.0
+	github.com/kyma-project/runtime-watcher/listener v1.4.0
 	github.com/prometheus/client_golang v1.23.2
 	github.com/sethgrid/pester v1.2.0
 	github.com/stretchr/testify v1.11.1

runtime-watcher/go.sum

@@ -25,8 +25,8 @@ 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/runtime-watcher/listener v1.3.0 h1:cpwqKSe092PB7PY9uEKovP2KHLf5xSU2ZnCQzSrEPl8=
-github.com/kyma-project/runtime-watcher/listener v1.3.0/go.mod h1:61P0hFo4pRHQACz4MgyXVX35Sm5zDPGaBeomB8i+30Q=
+github.com/kyma-project/runtime-watcher/listener v1.4.0 h1:a9mt7RqS3pDnjkbi01Hjd0dzQY4MbmcWSPf6nuVHChs=
+github.com/kyma-project/runtime-watcher/listener v1.4.0/go.mod h1:x4yfxqlJQVH2qQx+CMsI/CY4MQ9okWGbD3AfTDT/lP0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

runtime-watcher/pkg/admissionreview/handler.go

@@ -29,21 +29,18 @@ import (
 )
 
 const (
-	HTTPTimeout              = time.Minute * 3
-	eventEndpoint            = "event"
-	admissionError           = "admission error"
-	kcpReqFailedMsg          = "kcp request failed"
-	kcpReqSucceededMsg       = "kcp request succeeded"
-	urlPathPattern           = "/validate/%s"
-	ownedBy                  = "operator.kyma-project.io/owned-by"
-	statusSubResource        = "status"
-	namespaceNameEntityCount = 2
+	HTTPTimeout        = time.Minute * 3
+	eventEndpoint      = "event"
+	admissionError     = "admission error"
+	kcpReqFailedMsg    = "kcp request failed"
+	kcpReqSucceededMsg = "kcp request succeeded"
+	urlPathPattern     = "/validate/%s"
+	statusSubResource  = "status"
 )
 
 var (
 	errParseURLPath       = errors.New("could not parse url path")
 	errEmptyModule        = errors.New("module name must not be empty")
-	errNoOwner            = errors.New("no owner annotation found")
 	errInvalidSubResource = errors.New("invalid subresource")
 )
 
@@ -253,13 +250,7 @@ func (h *Handler) checkForChange(resource *Resource, oldObj, obj WatchedObject)
 func (h *Handler) sendRequestToKcp(moduleName string, watched WatchedObject) error {
 	h.metrics.UpdateKCPTotal()
 
-	owner, err := extractOwner(watched)
-	if err != nil {
-		return h.logAndReturnKCPErr(err, watchermetrics.ReasonOwner)
-	}
-
 	watcherEvent := &listenerTypes.WatchEvent{
-		Owner:      owner,
 		Watched:    listenerTypes.ObjectKey{Namespace: watched.Namespace, Name: watched.Name},
 		WatchedGvk: metav1.GroupVersionKind(schema.FromAPIVersionAndKind(watched.APIVersion, watched.Kind)),
 	}
@@ -320,21 +311,6 @@ func (h *Handler) logAndReturnKCPErr(err error, reason watchermetrics.KcpErrReas
 	return err
 }
 
-func extractOwner(watched WatchedObject) (listenerTypes.ObjectKey, error) {
-	if watched.Annotations == nil || watched.Annotations[ownedBy] == "" {
-		return listenerTypes.ObjectKey{}, fmt.Errorf("%w: no '%s' annotation found for watched resource %s",
-			errNoOwner, ownedBy, watched.NamespacedName())
-	}
-	ownerKey := watched.Annotations[ownedBy]
-	ownerParts := strings.Split(ownerKey, "/")
-	if len(ownerParts) != namespaceNameEntityCount {
-		return listenerTypes.ObjectKey{}, fmt.Errorf("%w: annotation %s not set correctly on resource %s: %s",
-			errNoOwner, ownedBy, watched.NamespacedName(), ownerKey)
-	}
-
-	return listenerTypes.ObjectKey{Namespace: ownerParts[0], Name: ownerParts[1]}, nil
-}
-
 func (h *Handler) getHTTPSClient() (*http.Client, error) {
 	httpsClient := http.Client{}
 

runtime-watcher/pkg/watchermetrics/metrics.go

@@ -32,7 +32,6 @@ const (
 	AdmissionRequestsTotal                   = "watcher_admission_request_total"
 	kcpErrReasonLabel                        = "error_reason"
 	ReasonSubresource           KcpErrReason = "invalid-subresource"
-	ReasonOwner                 KcpErrReason = "unknown-owner"
 	ReasonKcpAddress            KcpErrReason = "missing-address-or-contract"
 	ReasonRequest               KcpErrReason = "request-setup"
 	ReasonResponse              KcpErrReason = "failed-request"

runtime-watcher/tests/e2e/watcher_metrics_test.go

@@ -59,31 +59,5 @@ var _ = Describe("Watcher Metrics", Ordered, func() {
 					Should(BeNumerically("==", watchermetrics.FipsModeOnly))
 			})
 		})
-
-		It("When kyma does not have owned by annotation", func() {
-			Eventually(AddSkipReconciliationLabelToKyma).
-				WithContext(ctx).
-				WithArguments(controlPlaneClient, kyma.Name, kyma.Namespace).
-				Should(Succeed())
-
-			Eventually(RemoveKymaAnnotations).
-				WithContext(ctx).
-				WithArguments(runtimeClient, defaultRemoteKymaName, remoteNamespace).
-				Should(Succeed())
-
-			By("And spec of SKR Kyma CR is changed", func() {
-				Eventually(changeRemoteKymaChannel).
-					WithContext(ctx).
-					WithArguments(runtimeClient, "regular").
-					Should(Succeed())
-			})
-		})
-
-		It("Then Watcher Failed Kcp Metric is 1", func() {
-			Eventually(GetWatcherFailedKcpTotalMetric).
-				WithContext(ctx).
-				WithArguments(watchermetrics.ReasonOwner).
-				Should(BeNumerically(">=", 1))
-		})
 	})
 })

runtime-watcher/tests/go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/uuid v1.6.0
 	github.com/kyma-project/lifecycle-manager/api v1.0.0
-	github.com/kyma-project/runtime-watcher/listener v1.3.0
+	github.com/kyma-project/runtime-watcher/listener v1.4.0
 	github.com/kyma-project/runtime-watcher/skr v0.0.0-00010101000000-000000000000
 	github.com/onsi/ginkgo/v2 v2.27.3
 	github.com/onsi/gomega v1.38.3

runtime-watcher/tests/integration/handler_test.go

@@ -144,7 +144,6 @@ var _ = Describe("given watched resource", Ordered, func() {
 						Name:      testCase.params.watchedName,
 						Namespace: metav1.NamespaceDefault,
 					},
-					Owner: listenerTypes.ObjectKey{Name: ownerName, Namespace: metav1.NamespaceDefault},
 					WatchedGvk: metav1.GroupVersionKind(schema.FromAPIVersionAndKind(WatchedResourceAPIVersion,
 						WatchedResourceKind)),
 				},