Skip to content

Commit 4e67d9f

Browse files
Merge pull request #2156 from Nordix/remove-deprecated-modules/sunnat
🌱 Removes depreacted klogr.New() and rand.Seed()
2 parents a5a3fac + f9dc121 commit 4e67d9f

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

controllers/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/types"
3333
"k8s.io/client-go/kubernetes/scheme"
3434
"k8s.io/client-go/rest"
35-
"k8s.io/klog/v2/klogr"
35+
"k8s.io/klog/v2"
3636
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3737
"sigs.k8s.io/controller-runtime/pkg/client"
3838
"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -62,7 +62,7 @@ const (
6262
)
6363

6464
func init() {
65-
logf.SetLogger(klogr.New())
65+
logf.SetLogger(klog.Background())
6666

6767
// Register required object kinds with global scheme.
6868
_ = apiextensionsv1.AddToScheme(scheme.Scheme)

main.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"flag"
2222
"fmt"
23-
"math/rand"
2423
"os"
2524
"strconv"
2625
"time"
@@ -48,7 +47,7 @@ import (
4847
"k8s.io/component-base/logs"
4948
logsv1 "k8s.io/component-base/logs/api/v1"
5049
_ "k8s.io/component-base/logs/json/register"
51-
"k8s.io/klog/v2/klogr"
50+
"k8s.io/klog/v2"
5251
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
5352
"sigs.k8s.io/cluster-api/controllers/clustercache"
5453
"sigs.k8s.io/cluster-api/controllers/remote"
@@ -114,7 +113,6 @@ func init() {
114113
// +kubebuilder:rbac:groups=authorization.k8s.io,resources=subjectaccessreviews,verbs=create
115114

116115
func main() {
117-
rand.Seed(time.Now().UnixNano())
118116
initFlags(pflag.CommandLine)
119117
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
120118
pflag.Parse()
@@ -124,7 +122,7 @@ func main() {
124122
os.Exit(1)
125123
}
126124

127-
ctrl.SetLogger(klogr.New())
125+
ctrl.SetLogger(klog.Background())
128126
restConfig := ctrl.GetConfigOrDie()
129127
restConfig.QPS = restConfigQPS
130128
restConfig.Burst = restConfigBurst

0 commit comments

Comments
 (0)