Merge branch 'master' into no-jira-label-old-new

# Conflicts:
#	internal/controller/shared_controller.go

Author: rahmabPublic

internal/controller/shared_controller.go

@@ -515,7 +515,6 @@ func makeUptimeName[O pdoknlv3.WMSWFS](obj O) (string, error) {
 
 	ownerID, ok := obj.GetLabels()["dataset-owner"]
 	if !ok {
-		// Ve label
 		ownerID, ok = obj.GetLabels()["pdok.nl/owner-id"]
 		if !ok {
 			return "", errors.New("dataset-owner and pdok.nl/owner-id labels are not found in object")