Skip to content

Commit 0a6394f

Browse files
authored
Merge pull request #83 from halfcrazy/feat-unify-klog
stick klog to v2 version, drop klog v1 reference
2 parents fb65694 + 72ca591 commit 0a6394f

File tree

5 files changed

+3
-5
lines changed

5 files changed

+3
-5
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require (
1818
k8s.io/client-go v0.25.3
1919
k8s.io/code-generator v0.25.3
2020
k8s.io/component-base v0.25.3
21-
k8s.io/klog v1.0.0
2221
k8s.io/klog/v2 v2.70.1
2322
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
2423
)

go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1662,7 +1662,6 @@ k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
16621662
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
16631663
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
16641664
k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
1665-
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
16661665
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
16671666
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
16681667
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

pkg/builder/builder_auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package builder
22

33
import (
44
"github.com/spf13/pflag"
5-
"k8s.io/klog"
5+
"k8s.io/klog/v2"
66
"sigs.k8s.io/apiserver-runtime/internal/sample-apiserver/pkg/cmd/server"
77
)
88

pkg/builder/builder_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package builder
1919
import (
2020
"strings"
2121

22-
"k8s.io/klog"
22+
"k8s.io/klog/v2"
2323

2424
"k8s.io/apimachinery/pkg/runtime/schema"
2525
regsitryrest "k8s.io/apiserver/pkg/registry/rest"

sample/cmd/apiserver/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package main
2020
import (
2121
_ "k8s.io/client-go/plugin/pkg/client/auth" // register auth plugins
2222
"k8s.io/component-base/logs"
23-
"k8s.io/klog"
23+
"k8s.io/klog/v2"
2424
"sigs.k8s.io/apiserver-runtime/pkg/builder"
2525
"sigs.k8s.io/apiserver-runtime/sample/pkg/apis/sample/v1alpha1"
2626
"sigs.k8s.io/apiserver-runtime/sample/pkg/generated/openapi"

0 commit comments

Comments
 (0)