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.

Sign up for GitHub

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

Jump to bottom

Move to klog v2 #927

Merged
merged 2 commits into from
Aug 11, 2020
Merged

Move to klog v2 #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9447c1
require k8s.io/klog/v2
sanchezl Aug 7, 2020
0cf5528
move to klog/v2
sanchezl Aug 7, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
k8s.io/apiserver v0.19.0-rc.2
k8s.io/client-go v0.19.0-rc.2
k8s.io/component-base v0.19.0-rc.2
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.2.0
)

replace github.com/kubernetes-sigs/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20200312103335-32e07ea4f8ca
2 changes: 1 addition & 1 deletion pkg/cmd/certregenerationcontroller/cabundlesyncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
corev1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/v1helpers"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/checkendpoints/controller/connection_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/openshift/library-go/pkg/operator/events"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/cluster-kube-apiserver-operator/pkg/cmd/checkendpoints/operatorcontrolplane/podnetworkconnectivitycheck/v1alpha1helpers"
"github.com/openshift/cluster-kube-apiserver-operator/pkg/cmd/checkendpoints/trace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/checkendpoints/controller/pod_network_connectivity_check_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
coreinformersv1 "k8s.io/client-go/informers/core/v1"
v1 "k8s.io/client-go/listers/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// PodNetworkConnectivityCheckController continuously performs network connectivity
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/checkendpoints/trace/latency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httptrace"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
)

type LatencyInfo struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/insecurereadyz/readyz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// readyzOpts holds values to drive the readyz proxy.
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/recoveryapiserver/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path"

"github.com/spf13/cobra"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/cluster-kube-apiserver-operator/pkg/recovery"
)
Expand Down
2 changes: 1 addition & 1 deletion ...s/carry/kubecontrollermanager/certrotationcontroller/kubecontrollermanagercertrotation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/cluster-kube-apiserver-operator/pkg/cmd/regeneratecerts/carry/kubecontrollermanager/operatorclient"
"github.com/openshift/library-go/pkg/controller/factory"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/regeneratecerts/regenerate_certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/watch"
"k8s.io/klog"
"k8s.io/klog/v2"

configeversionedclient "github.com/openshift/client-go/config/clientset/versioned"
configexternalinformers "github.com/openshift/client-go/config/informers/externalversions"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/render/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
kyaml "k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/klog"
"k8s.io/klog/v2"

kubecontrolplanev1 "github.com/openshift/api/kubecontrolplane/v1"
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/audit"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/resourcegraph/resourcegraph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gonum/graph/encoding/dot"
"github.com/spf13/cobra"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/operatorclient"
"github.com/openshift/library-go/pkg/operator/resource/resourcegraph"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/boundsatokensignercontroller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"k8s.io/client-go/kubernetes"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/util/keyutil"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/library-go/pkg/controller/factory"
"github.com/openshift/library-go/pkg/operator/events"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/certrotationcontroller/certrotationcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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"

configinformers "github.com/openshift/client-go/config/informers/externalversions"
configlisterv1 "github.com/openshift/client-go/config/listers/config/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/certrotationcontroller/externalloadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"k8s.io/klog"
"k8s.io/klog/v2"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/cache"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/certrotationcontroller/internalloadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"k8s.io/klog"
"k8s.io/klog/v2"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/cache"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/certrotationcontroller/servicehostname.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net"

"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/apparentlymart/go-cidr/cidr"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configobservation/apiserver/observe_apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

"github.com/imdario/mergo"
"k8s.io/klog"
"k8s.io/klog/v2"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configobservation/apiserver/observe_cors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package apiserver

import (
"k8s.io/klog"
"k8s.io/klog/v2"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configobservation/auth/auth_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package auth

import (
"k8s.io/klog"
"k8s.io/klog/v2"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configobservation/auth/auth_serviceaccountissuer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator/configobservation"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/library-go/pkg/operator/configobserver"
"github.com/openshift/library-go/pkg/operator/events"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configobservation/images/observe_images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"

"k8s.io/klog"
"k8s.io/klog/v2"

"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/configobservation/scheduler/observe_scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"k8s.io/klog"
"k8s.io/klog/v2"
)

// ObserveDefaultNodeSelector reads the defaultNodeSelector from the scheduler configuration instance cluster
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/terminationobserver/termination_observer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/library-go/pkg/operator/events"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/recovery/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
clientcmdapiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
"k8s.io/klog"
"k8s.io/klog/v2"

"github.com/openshift/library-go/pkg/crypto"

Expand Down
2 changes: 1 addition & 1 deletion pkg/recovery/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/klog"
"k8s.io/klog/v2"
)

var (
Expand Down
16 changes: 0 additions & 16 deletions vendor/k8s.io/klog/.travis.yml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/k8s.io/klog/CONTRIBUTING.md
View file
Open in desktop

This file was deleted.