Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1883461: Upgrade to klog v2 #475

Merged
merged 1 commit into from Sep 30, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -20,6 +20,6 @@ require (
k8s.io/apimachinery v0.19.2
k8s.io/client-go v0.19.2
k8s.io/component-base v0.19.2
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.3.0
monis.app/go v0.0.0-20190702030534-c65526068664
)
3 changes: 1 addition & 2 deletions go.sum
Expand Up @@ -678,9 +678,8 @@ k8s.io/component-base v0.19.2 h1:jW5Y9RcZTb79liEhW3XDVTW7MuvEGP0tQZnfSX6/+gs=
k8s.io/component-base v0.19.2/go.mod h1:g5LrsiTiabMLZ40AR6Hl45f088DevyGY+cCE2agEIVo=
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/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
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/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco=
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/controllers/clidownloads/controller.go
Expand Up @@ -16,7 +16,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"

// openshift
v1 "github.com/openshift/api/console/v1"
Expand Down
Expand Up @@ -12,7 +12,7 @@ import (
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"

operatorsv1 "github.com/openshift/api/operator/v1"
operatorclientv1 "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/controllers/route/controller.go
Expand Up @@ -19,7 +19,7 @@ import (
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"

// openshift
operatorsv1 "github.com/openshift/api/operator/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/controllers/service/controller.go
Expand Up @@ -13,7 +13,7 @@ import (
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"

operatorsv1 "github.com/openshift/api/operator/v1"
operatorclientv1 "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/metrics/metrics.go
Expand Up @@ -3,7 +3,7 @@ package metrics
import (
k8smetrics "k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry"
"k8s.io/klog"
"k8s.io/klog/v2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/operator/operator.go
Expand Up @@ -13,7 +13,7 @@ import (
corev1 "k8s.io/client-go/informers/core/v1"
appsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"

// openshift
configv1 "github.com/openshift/api/config/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/operator/sync_v400.go
Expand Up @@ -10,7 +10,7 @@ import (
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/klog/v2"

// openshift
configv1 "github.com/openshift/api/config/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/status/status.go
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

appsv1 "k8s.io/api/apps/v1"
"k8s.io/klog"
"k8s.io/klog/v2"

operatorsv1 "github.com/openshift/api/operator/v1"
"github.com/openshift/console-operator/pkg/console/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/subresource/configmap/configmap.go
Expand Up @@ -5,7 +5,7 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/klog/v2"

configv1 "github.com/openshift/api/config/v1"
operatorv1 "github.com/openshift/api/operator/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/subresource/consoleserver/config_builder.go
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/openshift/console-operator/pkg/api"
"github.com/openshift/console-operator/pkg/console/subresource/util"
yaml "gopkg.in/yaml.v2"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/subresource/deployment/deployment.go
Expand Up @@ -11,7 +11,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
appsclientv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
"k8s.io/klog"
"k8s.io/klog/v2"

// openshift
configv1 "github.com/openshift/api/config/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/subresource/route/route.go
Expand Up @@ -10,7 +10,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/klog"
"k8s.io/klog/v2"

operatorv1 "github.com/openshift/api/operator/v1"
routev1 "github.com/openshift/api/route/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/subresource/util/util.go
Expand Up @@ -9,7 +9,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/klog"
"k8s.io/klog/v2"

operatorv1 "github.com/openshift/api/operator/v1"
"github.com/openshift/console-operator/pkg/api"
Expand Down
3 changes: 1 addition & 2 deletions vendor/k8s.io/klog/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/klog/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions vendor/k8s.io/klog/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/k8s.io/klog/go.sum

This file was deleted.