UPSTREAM: base: b68a062: post-v0.20

Signed-off-by: Dr. Stefan Schimanski <[email protected]>

Author: sttts

pkg/builder/doc.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2025 The Kubernetes Authors.
+Copyright 2018 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,19 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package builder wraps other multicluster-runtime libraries and exposes simple
+// Package builder wraps other controller-runtime libraries and exposes simple
 // patterns for building common Controllers.
 //
-// This is a fork of the controller-runtime builder package, adapted to´
-// mult-cluster use.
-//
-// Projects built with the builder package can trivially be rebased on top of
-// the underlying packages if the project requires more customized behavior in
-// the future.
+// Projects built with the builder package can trivially be rebased on top of the underlying
+// packages if the project requires more customized behavior in the future.
 package builder
 
 import (
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
 )
 
-var log = logf.Log.WithName("builder")
+var log = logf.RuntimeLog.WithName("builder")

pkg/builder/forked_builder_suite_test.go

@@ -21,20 +21,18 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/rest"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/internal/testing/addr"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-
-	"github.com/multicluster-runtime/multicluster-runtime/internal/forked/testing/addr"
 )
 
 func TestBuilder(t *testing.T) {
@@ -49,7 +47,10 @@ var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	testenv = &envtest.Environment{}
-	addCRDToEnvironment(testenv)
+	addCRDToEnvironment(testenv,
+		testDefaulterGVK,
+		testValidatorGVK,
+		testDefaultValidatorGVK)
 
 	var err error
 	cfg, err = testenv.Start()