remove klog v1

Signed-off-by: hwdef <hwdefcom@outlook.com>
volcano-sh · Oct 21, 2024 · f4eb4bd · f4eb4bd
1 parent 786d13f
commit f4eb4bd
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 203 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -47,6 +47,7 @@ linters:
     - govet
     # linters default enabled by golangci-lint .
     - deadcode
+    - depguard
     #- errcheck
     - gosimple
     - ineffassign
@@ -66,5 +67,10 @@ linters-settings:
     checks:
       - "all"
       - "-SA1019"   # TODO(fix) Using a deprecated function, variable, constant or field
-
-
+  depguard:
+    rules:
+      main:
+        list-mode: strict
+        deny:
+          - pkg: "k8s.io/klog"
+            desc: "klog is deprecated, use k8s.io/klog/v2 instead"
diff --git a/go.mod b/go.mod
@@ -33,7 +33,6 @@ require (
 	k8s.io/component-base v0.30.2
 	k8s.io/component-helpers v0.30.2
 	k8s.io/csi-translation-lib v0.30.2
-	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.120.1
 	k8s.io/kubernetes v1.30.2
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b

diff --git a/go.sum b/go.sum
@@ -50,7 +50,6 @@ github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBd
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -374,8 +373,6 @@ k8s.io/csi-translation-lib v0.30.2 h1:ZcFVMWDHg7feW3mtdl+xClgmw1Yxv7m9ysOKt8h3K8
 k8s.io/csi-translation-lib v0.30.2/go.mod h1:jFT8vquP6eSDUwDHk0mKT6uKFWlZp60ecUEUhmlGsOY=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
 k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kms v0.30.2 h1:VSZILO/tkzrz5Tu2j+yFQZ2Dc5JerQZX2GqhFJbQrfw=

diff --git a/licenses/k8s.io/klog/LICENSE b/licenses/k8s.io/klog/LICENSE
diff --git a/pkg/controllers/jobflow/jobflow_controller.go b/pkg/controllers/jobflow/jobflow_controller.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	vcclientset "volcano.sh/apis/pkg/client/clientset/versioned"
 	versionedscheme "volcano.sh/apis/pkg/client/clientset/versioned/scheme"

diff --git a/pkg/controllers/jobflow/jobflow_controller_action.go b/pkg/controllers/jobflow/jobflow_controller_action.go
@@ -26,7 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	"volcano.sh/apis/pkg/apis/batch/v1alpha1"

diff --git a/pkg/controllers/jobflow/jobflow_controller_handler.go b/pkg/controllers/jobflow/jobflow_controller_handler.go
@@ -17,7 +17,7 @@ limitations under the License.
 package jobflow
 
 import (
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	batch "volcano.sh/apis/pkg/apis/batch/v1alpha1"
 	jobflowv1alpha1 "volcano.sh/apis/pkg/apis/flow/v1alpha1"

diff --git a/pkg/controllers/jobtemplate/jobtemplate_controller.go b/pkg/controllers/jobtemplate/jobtemplate_controller.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	vcclientset "volcano.sh/apis/pkg/client/clientset/versioned"
 	versionedscheme "volcano.sh/apis/pkg/client/clientset/versioned/scheme"

diff --git a/pkg/controllers/jobtemplate/jobtemplate_controller_action.go b/pkg/controllers/jobtemplate/jobtemplate_controller_action.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	v1alpha1flow "volcano.sh/apis/pkg/apis/flow/v1alpha1"
 )

diff --git a/pkg/controllers/jobtemplate/jobtemplate_controller_handler.go b/pkg/controllers/jobtemplate/jobtemplate_controller_handler.go
@@ -19,7 +19,7 @@ package jobtemplate
 import (
 	"strings"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	batch "volcano.sh/apis/pkg/apis/batch/v1alpha1"
 	"volcano.sh/apis/pkg/apis/flow/v1alpha1"