Skip to content

Commit 2e71326

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #968 from s-urbaniak/bz-1885246
Bug 1885246: pkg/*: use k8s.io/klog/v2
2 parents 46e4cc5 + 6f2a5eb commit 2e71326

Some content is hidden

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

49 files changed

+906
-2299
lines changed

‎cmd/operator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"golang.org/x/sync/errgroup"
3131
"k8s.io/apimachinery/pkg/util/yaml"
3232
"k8s.io/client-go/tools/clientcmd"
33-
"k8s.io/klog"
33+
"k8s.io/klog/v2"
3434

3535
cmo "github.com/openshift/cluster-monitoring-operator/pkg/operator"
3636
)

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ require (
88
github.com/ghodss/yaml v1.0.0
99
github.com/gogo/protobuf v1.3.1
1010
github.com/imdario/mergo v0.3.7
11-
github.com/openshift/api v0.0.0-20200623075207-eb651a5bb0ad
12-
github.com/openshift/client-go v0.0.0-20200623090625-83993cebb5ae
13-
github.com/openshift/library-go v0.0.0-20200421122923-c1de486c7d47
11+
github.com/openshift/api v0.0.0-20200722170803-0ba2c3658da6
12+
github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15
13+
github.com/openshift/library-go v0.0.0-20200722204747-e3f2c82ff290
1414
github.com/pkg/errors v0.9.1
1515
github.com/prometheus/client_golang v1.7.1
1616
github.com/prometheus/prometheus v1.8.2-0.20200609102542-5d7e3e970602 // v1.8.2 is misleading as Prometheus does not have v2 module. This is pointing to v2.19.0, the same as in promehteus- operator v0.40.0
1717
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
1818
golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 // indirect
1919
k8s.io/api v0.19.2
20-
k8s.io/apiextensions-apiserver v0.18.3
20+
k8s.io/apiextensions-apiserver v0.19.0-rc.2
2121
k8s.io/apimachinery v0.19.2
2222
k8s.io/apiserver v0.19.2
2323
k8s.io/client-go v12.0.0+incompatible
24-
k8s.io/klog v1.0.0
24+
k8s.io/klog/v2 v2.2.0
2525
k8s.io/kube-aggregator v0.19.2
2626
k8s.io/metrics v0.18.4
2727
)

‎go.sum

Lines changed: 20 additions & 26 deletions
Large diffs are not rendered by default.

‎pkg/client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import (
4848
"k8s.io/client-go/kubernetes"
4949
"k8s.io/client-go/rest"
5050
"k8s.io/client-go/tools/cache"
51-
"k8s.io/klog"
51+
"k8s.io/klog/v2"
5252
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
5353
aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
5454
)

‎pkg/manifests/tls.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"math/big"
2222
"time"
2323

24-
"k8s.io/klog"
24+
"k8s.io/klog/v2"
2525

2626
"github.com/openshift/library-go/pkg/crypto"
2727
"github.com/pkg/errors"

‎pkg/operator/operator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/client-go/rest"
3131
"k8s.io/client-go/tools/cache"
3232
"k8s.io/client-go/util/workqueue"
33-
"k8s.io/klog"
33+
"k8s.io/klog/v2"
3434

3535
"github.com/openshift/cluster-monitoring-operator/pkg/client"
3636
"github.com/openshift/cluster-monitoring-operator/pkg/manifests"

‎pkg/tasks/clustermonitoringoperator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/pkg/errors"
2121
rbacv1 "k8s.io/api/rbac/v1"
2222
apierrors "k8s.io/apimachinery/pkg/api/errors"
23-
"k8s.io/klog"
23+
"k8s.io/klog/v2"
2424
)
2525

2626
type ClusterMonitoringOperatorTask struct {

‎pkg/tasks/prometheus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/openshift/cluster-monitoring-operator/pkg/client"
2121
"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
2222
"github.com/pkg/errors"
23-
"k8s.io/klog"
23+
"k8s.io/klog/v2"
2424
)
2525

2626
type PrometheusTask struct {

‎pkg/tasks/prometheus_user_workload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
2020

2121
"github.com/pkg/errors"
22-
"k8s.io/klog"
22+
"k8s.io/klog/v2"
2323
)
2424

2525
type PrometheusUserWorkloadTask struct {

‎pkg/tasks/tasks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/openshift/cluster-monitoring-operator/pkg/client"
1919
"github.com/pkg/errors"
2020
"golang.org/x/sync/errgroup"
21-
"k8s.io/klog"
21+
"k8s.io/klog/v2"
2222
)
2323

2424
type TaskRunner struct {

‎vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml

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

‎vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml

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

‎vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml

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

‎vendor/github.com/openshift/api/config/v1/types_authentication.go

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

‎vendor/github.com/openshift/api/config/v1/types_build.go

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

‎vendor/github.com/openshift/api/config/v1/types_infrastructure.go

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

‎vendor/github.com/openshift/api/config/v1/types_oauth.go

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

0 commit comments

Comments
 (0)