Skip to content

Commit a738b98

Browse files
committed
UPSTREAM: base: b68a062: post-v0.20
Signed-off-by: Dr. Stefan Schimanski <[email protected]>
1 parent 2029131 commit a738b98

File tree

6 files changed

+154
-221
lines changed

6 files changed

+154
-221
lines changed

pkg/builder/doc.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2025 The Kubernetes Authors.
2+
Copyright 2018 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
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
1414
limitations under the License.
1515
*/
1616

17-
// Package builder wraps other multicluster-runtime libraries and exposes simple
17+
// Package builder wraps other controller-runtime libraries and exposes simple
1818
// patterns for building common Controllers.
1919
//
20-
// This is a fork of the controller-runtime builder package, adapted to´
21-
// mult-cluster use.
22-
//
23-
// Projects built with the builder package can trivially be rebased on top of
24-
// the underlying packages if the project requires more customized behavior in
25-
// the future.
20+
// Projects built with the builder package can trivially be rebased on top of the underlying
21+
// packages if the project requires more customized behavior in the future.
2622
package builder
2723

2824
import (
29-
logf "sigs.k8s.io/controller-runtime/pkg/log"
25+
logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
3026
)
3127

32-
var log = logf.Log.WithName("builder")
28+
var log = logf.RuntimeLog.WithName("builder")

pkg/builder/forked_builder_suite_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,18 @@ import (
2121

2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
2524
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2625
"k8s.io/apimachinery/pkg/api/meta"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
"k8s.io/apimachinery/pkg/runtime/schema"
2928
"k8s.io/client-go/rest"
29+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3030

3131
"sigs.k8s.io/controller-runtime/pkg/envtest"
32+
"sigs.k8s.io/controller-runtime/pkg/internal/testing/addr"
3233
logf "sigs.k8s.io/controller-runtime/pkg/log"
3334
"sigs.k8s.io/controller-runtime/pkg/log/zap"
34-
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3535
"sigs.k8s.io/controller-runtime/pkg/webhook"
36-
37-
"github.com/multicluster-runtime/multicluster-runtime/internal/forked/testing/addr"
3836
)
3937

4038
func TestBuilder(t *testing.T) {
@@ -49,7 +47,10 @@ var _ = BeforeSuite(func() {
4947
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
5048

5149
testenv = &envtest.Environment{}
52-
addCRDToEnvironment(testenv)
50+
addCRDToEnvironment(testenv,
51+
testDefaulterGVK,
52+
testValidatorGVK,
53+
testDefaultValidatorGVK)
5354

5455
var err error
5556
cfg, err = testenv.Start()

0 commit comments

Comments
 (0)