Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ go 1.15

require (
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200820094136-e5e36003a999
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/client-go v0.19.0
k8s.io/cloud-provider v0.19.0
k8s.io/component-base v0.19.0
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.2.0
k8s.io/kubernetes v1.19.0
)

Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,6 @@ k8s.io/csi-translation-lib v0.19.0/go.mod h1:zGS1YqV8U2So/t4Hz8SoRXMx5y5/KSKnA6B
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
Expand Down
2 changes: 1 addition & 1 deletion scaleway/baremetal.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type baremetal struct {
Expand Down
2 changes: 1 addition & 1 deletion scaleway/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/scaleway/scaleway-sdk-go/scw"
"k8s.io/client-go/kubernetes"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion scaleway/instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type instances struct {
Expand Down
2 changes: 1 addition & 1 deletion scaleway/loadbalancers.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
scwlb "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
v1 "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions scaleway/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/scaleway/scaleway-sdk-go/logger"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// Logger completes klog to be able to implement the Logger interface for the SDK
Expand All @@ -14,14 +14,14 @@ var logging Logger

// Debugf logs to DEBUG log. Arguments are handled in the manner of fmt.Printf.
func (Logger) Debugf(format string, args ...interface{}) {
if klog.V(4) {
if klog.V(4).Enabled() {
klog.InfoDepth(2, fmt.Sprintf(format, args...))
}
}

// Infof logs to INFO log. Arguments are handled in the manner of fmt.Printf.
func (Logger) Infof(format string, args ...interface{}) {
if klog.V(2) {
if klog.V(2).Enabled() {
klog.InfoDepth(2, fmt.Sprintf(format, args...))
}
}
Expand All @@ -44,11 +44,11 @@ func (Logger) ShouldLog(level logger.LogLevel) bool {
case logger.LogLevelWarning:
return true
case logger.LogLevelInfo:
if klog.V(2) {
if klog.V(2).Enabled() {
return true
}
case logger.LogLevelDebug:
if klog.V(5) {
if klog.V(5).Enabled() {
return true
}
default:
Expand Down
2 changes: 1 addition & 1 deletion scaleway/patcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/kubernetes"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type kubePatcher struct {
Expand Down
2 changes: 1 addition & 1 deletion scaleway/servers.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion scaleway/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type syncController struct {
Expand Down