Skip to content

Commit 41287a4

Browse files
authored
Upgrade klog v1 to v2 (#720)
1 parent c2b212b commit 41287a4

File tree

7 files changed

+9
-13
lines changed

7 files changed

+9
-13
lines changed

cmd/mpi-operator/app/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
election "k8s.io/client-go/tools/leaderelection"
3939
"k8s.io/client-go/tools/leaderelection/resourcelock"
4040
"k8s.io/client-go/tools/record"
41-
"k8s.io/klog"
41+
"k8s.io/klog/v2"
4242
schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned"
4343
volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
4444

cmd/mpi-operator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020
"net/http"
2121

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

2424
"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app"
2525
"github.com/kubeflow/mpi-operator/cmd/mpi-operator/app/options"

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ require (
1616
k8s.io/apiserver v0.33.4
1717
k8s.io/client-go v0.33.4
1818
k8s.io/code-generator v0.33.4
19-
k8s.io/klog v1.0.0
19+
k8s.io/klog/v2 v2.130.1
2020
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
2121
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2222
sigs.k8s.io/controller-runtime v0.21.0
2323
sigs.k8s.io/kind v0.29.0
2424
sigs.k8s.io/scheduler-plugins v0.32.7
25-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
25+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
2626
volcano.sh/apis v1.12.2
2727
)
2828

@@ -291,7 +291,6 @@ require (
291291
k8s.io/apiextensions-apiserver v0.33.0 // indirect
292292
k8s.io/component-base v0.33.4 // indirect
293293
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
294-
k8s.io/klog/v2 v2.130.1 // indirect
295294
mvdan.cc/gofumpt v0.9.1 // indirect
296295
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
297296
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect

go.sum

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ github.com/ghostiam/protogetter v0.3.16 h1:UkrisuJBYLnZW6FcYUNBDJOqY3X22RtoYMlCs
159159
github.com/ghostiam/protogetter v0.3.16/go.mod h1:4SRRIv6PcjkIMpUkRUsP4TsUTqO/N3Fmvwivuc/sCHA=
160160
github.com/go-critic/go-critic v0.13.0 h1:kJzM7wzltQasSUXtYyTl6UaPVySO6GkaR1thFnJ6afY=
161161
github.com/go-critic/go-critic v0.13.0/go.mod h1:M/YeuJ3vOCQDnP2SU+ZhjgRzwzcBW87JqLpMJLrZDLI=
162-
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
163162
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
164163
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
165164
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -826,8 +825,6 @@ k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY=
826825
k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc=
827826
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
828827
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
829-
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
830-
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
831828
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
832829
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
833830
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
@@ -851,8 +848,8 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
851848
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
852849
sigs.k8s.io/scheduler-plugins v0.32.7 h1:fGr4JKraaTe6it4PIqUlXStfctFKYxJgYkDsiU6699o=
853850
sigs.k8s.io/scheduler-plugins v0.32.7/go.mod h1:Oem5rktj6wgFr2SUqcaInUTIBX8tlY8c4qid5vp2lBw=
854-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
855-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
851+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
852+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
856853
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
857854
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
858855
volcano.sh/apis v1.12.2 h1:KvNyM/kMizFVlALiH/uFHPwYFHRtxuVnBL0upbFbDss=

hack/python-sdk/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323
"strings"
2424

25-
"k8s.io/klog"
25+
"k8s.io/klog/v2"
2626
"k8s.io/kube-openapi/pkg/common"
2727
"k8s.io/kube-openapi/pkg/validation/spec"
2828

pkg/controller/mpi_job_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import (
5353
"k8s.io/client-go/tools/cache"
5454
"k8s.io/client-go/tools/record"
5555
"k8s.io/client-go/util/workqueue"
56-
"k8s.io/klog"
56+
"k8s.io/klog/v2"
5757
"k8s.io/utils/clock"
5858
"k8s.io/utils/ptr"
5959
schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned"

pkg/controller/podgroup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
schedulinglisters "k8s.io/client-go/listers/scheduling/v1"
2626
"k8s.io/client-go/tools/cache"
27-
"k8s.io/klog"
27+
"k8s.io/klog/v2"
2828
"k8s.io/utils/ptr"
2929
schedv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
3030
schedclientset "sigs.k8s.io/scheduler-plugins/pkg/generated/clientset/versioned"

0 commit comments

Comments
 (0)