Skip to content

Commit ba3f278

Browse files
k82cnk82cn
committed
Update to klog.
Signed-off-by: Klaus Ma <klaus1982.cn@gmail.com>
1 parent a2c4436 commit ba3f278

59 files changed

Lines changed: 519 additions & 2092 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Gopkg.lock‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ required = [
3232
"k8s.io/code-generator/cmd/defaulter-gen",
3333
]
3434

35-
[[constraint]]
36-
branch = "master"
37-
name = "github.com/golang/glog"
38-
3935
[[constraint]]
4036
name = "github.com/onsi/ginkgo"
4137
version = "1.7.0"

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ generate-code:
6868
./hack/update-gencode.sh
6969

7070
unit-test:
71+
go clean -testcache
7172
go list ./... | grep -v e2e | xargs go test -v -race
7273

7374
e2e-test-kind:

‎cmd/admission/app/options/options.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ import (
2020
"flag"
2121
"fmt"
2222

23-
"github.com/golang/glog"
24-
2523
"k8s.io/api/admissionregistration/v1beta1"
2624
apierrors "k8s.io/apimachinery/pkg/api/errors"
2725
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2826
"k8s.io/client-go/kubernetes"
2927
admissionregistrationv1beta1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1"
28+
"k8s.io/klog"
3029
)
3130

3231
const (
@@ -235,13 +234,13 @@ func registerMutateWebhook(client admissionregistrationv1beta1.MutatingWebhookCo
235234
return err
236235
}
237236
if err == nil && existing != nil {
238-
glog.Infof("Updating MutatingWebhookConfiguration %v", hook)
237+
klog.Infof("Updating MutatingWebhookConfiguration %v", hook)
239238
existing.Webhooks = hook.Webhooks
240239
if _, err := client.Update(existing); err != nil {
241240
return err
242241
}
243242
} else {
244-
glog.Infof("Creating MutatingWebhookConfiguration %v", hook)
243+
klog.Infof("Creating MutatingWebhookConfiguration %v", hook)
245244
if _, err := client.Create(&hook); err != nil {
246245
return err
247246
}
@@ -259,12 +258,12 @@ func registerValidateWebhook(client admissionregistrationv1beta1.ValidatingWebho
259258
}
260259
if err == nil && existing != nil {
261260
existing.Webhooks = hook.Webhooks
262-
glog.Infof("Updating ValidatingWebhookConfiguration %v", hook)
261+
klog.Infof("Updating ValidatingWebhookConfiguration %v", hook)
263262
if _, err := client.Update(existing); err != nil {
264263
return err
265264
}
266265
} else {
267-
glog.Infof("Creating ValidatingWebhookConfiguration %v", hook)
266+
klog.Infof("Creating ValidatingWebhookConfiguration %v", hook)
268267
if _, err := client.Create(&hook); err != nil {
269268
return err
270269
}

‎cmd/admission/app/server.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package app
1919
import (
2020
"crypto/tls"
2121

22-
"github.com/golang/glog"
23-
2422
"k8s.io/client-go/kubernetes"
2523
"k8s.io/client-go/rest"
24+
"k8s.io/klog"
25+
2626
"volcano.sh/volcano/cmd/admission/app/options"
2727
"volcano.sh/volcano/pkg/client/clientset/versioned"
2828
)
@@ -31,7 +31,7 @@ import (
3131
func GetClient(restConfig *rest.Config) *kubernetes.Clientset {
3232
clientset, err := kubernetes.NewForConfig(restConfig)
3333
if err != nil {
34-
glog.Fatal(err)
34+
klog.Fatal(err)
3535
}
3636
return clientset
3737
}
@@ -40,7 +40,7 @@ func GetClient(restConfig *rest.Config) *kubernetes.Clientset {
4040
func GetVolcanoClient(restConfig *rest.Config) *versioned.Clientset {
4141
clientset, err := versioned.NewForConfig(restConfig)
4242
if err != nil {
43-
glog.Fatal(err)
43+
klog.Fatal(err)
4444
}
4545
return clientset
4646
}
@@ -52,7 +52,7 @@ func ConfigTLS(config *options.Config, restConfig *rest.Config) *tls.Config {
5252
if len(config.CertFile) != 0 && len(config.KeyFile) != 0 {
5353
sCert, err := tls.LoadX509KeyPair(config.CertFile, config.KeyFile)
5454
if err != nil {
55-
glog.Fatal(err)
55+
klog.Fatal(err)
5656
}
5757

5858
return &tls.Config{
@@ -63,14 +63,14 @@ func ConfigTLS(config *options.Config, restConfig *rest.Config) *tls.Config {
6363
if len(restConfig.CertData) != 0 && len(restConfig.KeyData) != 0 {
6464
sCert, err := tls.X509KeyPair(restConfig.CertData, restConfig.KeyData)
6565
if err != nil {
66-
glog.Fatal(err)
66+
klog.Fatal(err)
6767
}
6868

6969
return &tls.Config{
7070
Certificates: []tls.Certificate{sCert},
7171
}
7272
}
7373

74-
glog.Fatal("tls: failed to find any tls config data")
74+
klog.Fatal("tls: failed to find any tls config data")
7575
return &tls.Config{}
7676
}

‎cmd/admission/main.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ import (
2424
"strconv"
2525
"syscall"
2626

27-
"github.com/golang/glog"
28-
2927
"k8s.io/client-go/tools/clientcmd"
28+
"k8s.io/klog"
3029

3130
"volcano.sh/volcano/cmd/admission/app"
3231
"volcano.sh/volcano/cmd/admission/app/options"
@@ -55,13 +54,13 @@ func main() {
5554
http.HandleFunc(admission.MutateJobPath, serveMutateJobs)
5655

5756
if err := config.CheckPortOrDie(); err != nil {
58-
glog.Fatalf("Configured port is invalid: %v", err)
57+
klog.Fatalf("Configured port is invalid: %v", err)
5958
}
6059
addr := ":" + strconv.Itoa(config.Port)
6160

6261
restConfig, err := clientcmd.BuildConfigFromFlags(config.Master, config.Kubeconfig)
6362
if err != nil {
64-
glog.Fatalf("Unable to build k8s config: %v", err)
63+
klog.Fatalf("Unable to build k8s config: %v", err)
6564
}
6665

6766
admission.VolcanoClientSet = app.GetVolcanoClient(restConfig)
@@ -70,12 +69,12 @@ func main() {
7069

7170
caBundle, err := ioutil.ReadFile(config.CaCertFile)
7271
if err != nil {
73-
glog.Fatalf("Unable to read cacert file: %v", err)
72+
klog.Fatalf("Unable to read cacert file: %v", err)
7473
}
7574

7675
err = options.RegisterWebhooks(config, app.GetClient(restConfig), caBundle)
7776
if err != nil {
78-
glog.Fatalf("Unable to register webhook configs: %v", err)
77+
klog.Fatalf("Unable to register webhook configs: %v", err)
7978
}
8079

8180
stopChannel := make(chan os.Signal)
@@ -89,15 +88,15 @@ func main() {
8988
go func() {
9089
err = server.ListenAndServeTLS("", "")
9190
if err != nil && err != http.ErrServerClosed {
92-
glog.Fatalf("ListenAndServeTLS for admission webhook failed: %v", err)
91+
klog.Fatalf("ListenAndServeTLS for admission webhook failed: %v", err)
9392
close(webhookServeError)
9493
}
9594
}()
9695

9796
select {
9897
case <-stopChannel:
9998
if err := server.Close(); err != nil {
100-
glog.Fatalf("Close admission server failed: %v", err)
99+
klog.Fatalf("Close admission server failed: %v", err)
101100
}
102101
return
103102
case <-webhookServeError:

‎cmd/cli/vcctl.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"os"
2121
"time"
2222

23-
"github.com/golang/glog"
2423
"github.com/spf13/cobra"
2524
"github.com/spf13/pflag"
2625

2726
"k8s.io/apimachinery/pkg/util/wait"
27+
"k8s.io/klog"
2828

2929
"volcano.sh/volcano/pkg/version"
3030
)
@@ -34,9 +34,11 @@ var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum
3434
func main() {
3535
// flag.InitFlags()
3636

37-
// The default glog flush interval is 30 seconds, which is frighteningly long.
38-
go wait.Until(glog.Flush, *logFlushFreq, wait.NeverStop)
39-
defer glog.Flush()
37+
klog.InitFlags(nil)
38+
39+
// The default klog flush interval is 30 seconds, which is frighteningly long.
40+
go wait.Until(klog.Flush, *logFlushFreq, wait.NeverStop)
41+
defer klog.Flush()
4042

4143
rootCmd := cobra.Command{
4244
Use: "vcctl",

‎cmd/controllers/app/server.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323
"time"
2424

25-
"github.com/golang/glog"
25+
"k8s.io/klog"
2626

2727
"k8s.io/api/core/v1"
2828
"k8s.io/apimachinery/pkg/util/uuid"
@@ -129,7 +129,7 @@ func Run(opt *options.ServerOption) error {
129129
Callbacks: leaderelection.LeaderCallbacks{
130130
OnStartedLeading: run,
131131
OnStoppedLeading: func() {
132-
glog.Fatalf("leaderelection lost")
132+
klog.Fatalf("leaderelection lost")
133133
},
134134
},
135135
})

‎cmd/controllers/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"os"
2121
"time"
2222

23-
"github.com/golang/glog"
2423
"github.com/spf13/pflag"
2524

2625
"k8s.io/apimachinery/pkg/util/wait"
2726
"k8s.io/apiserver/pkg/util/flag"
27+
"k8s.io/klog"
2828

2929
"volcano.sh/volcano/cmd/controllers/app"
3030
"volcano.sh/volcano/cmd/controllers/app/options"
@@ -38,6 +38,7 @@ func main() {
3838
s.AddFlags(pflag.CommandLine)
3939

4040
flag.InitFlags()
41+
klog.InitFlags(nil)
4142

4243
if s.PrintVersion {
4344
version.PrintVersionAndExit()
@@ -46,9 +47,9 @@ func main() {
4647
fmt.Fprintf(os.Stderr, "%v\n", err)
4748
os.Exit(1)
4849
}
49-
// The default glog flush interval is 30 seconds, which is frighteningly long.
50-
go wait.Until(glog.Flush, *logFlushFreq, wait.NeverStop)
51-
defer glog.Flush()
50+
// The default klog flush interval is 30 seconds, which is frighteningly long.
51+
go wait.Until(klog.Flush, *logFlushFreq, wait.NeverStop)
52+
defer klog.Flush()
5253

5354
if err := app.Run(s); err != nil {
5455
fmt.Fprintf(os.Stderr, "%v\n", err)

‎cmd/scheduler/app/server.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"os"
2424
"time"
2525

26-
"github.com/golang/glog"
2726
"github.com/prometheus/client_golang/prometheus/promhttp"
2827

2928
"volcano.sh/volcano/cmd/scheduler/app/options"
@@ -36,6 +35,7 @@ import (
3635
clientset "k8s.io/client-go/kubernetes"
3736
"k8s.io/client-go/kubernetes/scheme"
3837
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
38+
"k8s.io/klog"
3939

4040
// Register gcp auth
4141
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
@@ -95,7 +95,7 @@ func Run(opt *options.ServerOption) error {
9595

9696
go func() {
9797
http.Handle("/metrics", promhttp.Handler())
98-
glog.Fatalf("Prometheus Http Server failed %s", http.ListenAndServe(opt.ListenAddress, nil))
98+
klog.Fatalf("Prometheus Http Server failed %s", http.ListenAndServe(opt.ListenAddress, nil))
9999
}()
100100

101101
if err := helpers.StartHealthz(opt.HealthzBindAddress, "volcano-scheduler"); err != nil {
@@ -149,7 +149,7 @@ func Run(opt *options.ServerOption) error {
149149
Callbacks: leaderelection.LeaderCallbacks{
150150
OnStartedLeading: run,
151151
OnStoppedLeading: func() {
152-
glog.Fatalf("leaderelection lost")
152+
klog.Fatalf("leaderelection lost")
153153
},
154154
},
155155
})

0 commit comments

Comments
 (0)