diff --git a/pkg/kubelet/util/pluginwatcher/plugin_watcher.go b/pkg/kubelet/util/pluginwatcher/plugin_watcher.go index 15f49a6acd..50b3f6c44c 100644 --- a/pkg/kubelet/util/pluginwatcher/plugin_watcher.go +++ b/pkg/kubelet/util/pluginwatcher/plugin_watcher.go @@ -184,7 +184,7 @@ func (w *Watcher) traversePluginDir(dir string) error { return fmt.Errorf("error accessing path: %s error: %v", path, err) } - glog.Errorf("error accessing path: %s error: %v", path, err) + klog.Errorf("error accessing path: %s error: %v", path, err) return nil } diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/BUILD b/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/BUILD index 395ed1cae2..a838ddc87c 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/BUILD +++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/BUILD @@ -28,7 +28,7 @@ go_library( "//staging/src/k8s.io/client-go/informers/auditregistration/v1alpha1:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", - "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/dynamic.go b/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/dynamic.go index 498737ab3b..a8347aa3e7 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/dynamic.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic/dynamic.go @@ -23,7 +23,7 @@ import ( "sync" "sync/atomic" - "github.com/golang/glog" + "k8s.io/klog" auditregv1alpha1 "k8s.io/api/auditregistration/v1alpha1" corev1 "k8s.io/api/core/v1" @@ -88,7 +88,7 @@ func (d *delegate) gracefulShutdown() { // based on a shared informer. func NewBackend(c *Config) (audit.Backend, error) { eventBroadcaster := record.NewBroadcaster() - eventBroadcaster.StartLogging(glog.Infof) + eventBroadcaster.StartLogging(klog.Infof) eventBroadcaster.StartRecordingToSink(c.EventConfig.Sink) scheme := runtime.NewScheme() @@ -139,12 +139,12 @@ func NewBackend(c *Config) (audit.Backend, error) { if !ok { tombstone, ok := obj.(cache.DeletedFinalStateUnknown) if !ok { - glog.V(2).Infof("Couldn't get object from tombstone %#v", obj) + klog.V(2).Infof("Couldn't get object from tombstone %#v", obj) return } sink, ok = tombstone.Obj.(*auditregv1alpha1.AuditSink) if !ok { - glog.V(2).Infof("Tombstone contained object that is not an AuditSink: %#v", obj) + klog.V(2).Infof("Tombstone contained object that is not an AuditSink: %#v", obj) return } } @@ -235,20 +235,20 @@ func (b *backend) addSink(sink *auditregv1alpha1.AuditSink) { defer b.delegateUpdateMutex.Unlock() delegates := b.copyDelegates() if _, ok := delegates[sink.UID]; ok { - glog.Errorf("Audit sink %q uid: %s already exists, could not readd", sink.Name, sink.UID) + klog.Errorf("Audit sink %q uid: %s already exists, could not readd", sink.Name, sink.UID) return } d, err := b.createAndStartDelegate(sink) if err != nil { msg := fmt.Sprintf("Could not add audit sink %q: %v", sink.Name, err) - glog.Error(msg) + klog.Error(msg) b.recorder.Event(sink, corev1.EventTypeWarning, "CreateFailed", msg) return } delegates[sink.UID] = d b.setDelegates(delegates) - glog.V(2).Infof("Added audit sink: %s", sink.Name) - glog.V(2).Infof("Current audit sinks: %v", delegates.Names()) + klog.V(2).Infof("Added audit sink: %s", sink.Name) + klog.V(2).Infof("Current audit sinks: %v", delegates.Names()) } // updateSink is called by the shared informer when a sink is updated. @@ -261,7 +261,7 @@ func (b *backend) updateSink(oldSink, newSink *auditregv1alpha1.AuditSink) { delegates := b.copyDelegates() oldDelegate, ok := delegates[oldSink.UID] if !ok { - glog.Errorf("Could not update audit sink %q uid: %s, old sink does not exist", + klog.Errorf("Could not update audit sink %q uid: %s, old sink does not exist", oldSink.Name, oldSink.UID) return } @@ -276,7 +276,7 @@ func (b *backend) updateSink(oldSink, newSink *auditregv1alpha1.AuditSink) { d, err := b.createAndStartDelegate(newSink) if err != nil { msg := fmt.Sprintf("Could not update audit sink %q: %v", oldSink.Name, err) - glog.Error(msg) + klog.Error(msg) b.recorder.Event(newSink, corev1.EventTypeWarning, "UpdateFailed", msg) return } @@ -286,8 +286,8 @@ func (b *backend) updateSink(oldSink, newSink *auditregv1alpha1.AuditSink) { oldDelegate.gracefulShutdown() } - glog.V(2).Infof("Updated audit sink: %s", newSink.Name) - glog.V(2).Infof("Current audit sinks: %v", delegates.Names()) + klog.V(2).Infof("Updated audit sink: %s", newSink.Name) + klog.V(2).Infof("Current audit sinks: %v", delegates.Names()) } // deleteSink is called by the shared informer when a sink is deleted @@ -297,14 +297,14 @@ func (b *backend) deleteSink(sink *auditregv1alpha1.AuditSink) { delegates := b.copyDelegates() delegate, ok := delegates[sink.UID] if !ok { - glog.Errorf("Could not delete audit sink %q uid: %s, does not exist", sink.Name, sink.UID) + klog.Errorf("Could not delete audit sink %q uid: %s, does not exist", sink.Name, sink.UID) return } delete(delegates, sink.UID) b.setDelegates(delegates) delegate.gracefulShutdown() - glog.V(2).Infof("Deleted audit sink: %s", sink.Name) - glog.V(2).Infof("Current audit sinks: %v", delegates.Names()) + klog.V(2).Infof("Deleted audit sink: %s", sink.Name) + klog.V(2).Infof("Current audit sinks: %v", delegates.Names()) } // createAndStartDelegate will build a delegate from an audit sink configuration and run it diff --git a/test/images/crd-conversion-webhook/BUILD b/test/images/crd-conversion-webhook/BUILD index dff07ed4d9..9018d79e77 100644 --- a/test/images/crd-conversion-webhook/BUILD +++ b/test/images/crd-conversion-webhook/BUILD @@ -12,7 +12,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//test/images/crd-conversion-webhook/converter:go_default_library", - "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/test/images/crd-conversion-webhook/config.go b/test/images/crd-conversion-webhook/config.go index b410efeb15..11ff1b5d98 100644 --- a/test/images/crd-conversion-webhook/config.go +++ b/test/images/crd-conversion-webhook/config.go @@ -21,19 +21,18 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - - "github.com/golang/glog" + "k8s.io/klog" ) // Get a clientset with in-cluster config. func getClient() *kubernetes.Clientset { config, err := rest.InClusterConfig() if err != nil { - glog.Fatal(err) + klog.Fatal(err) } clientset, err := kubernetes.NewForConfig(config) if err != nil { - glog.Fatal(err) + klog.Fatal(err) } return clientset } @@ -41,7 +40,7 @@ func getClient() *kubernetes.Clientset { func configTLS(config Config, clientset *kubernetes.Clientset) *tls.Config { sCert, err := tls.LoadX509KeyPair(config.CertFile, config.KeyFile) if err != nil { - glog.Fatal(err) + klog.Fatal(err) } return &tls.Config{ Certificates: []tls.Certificate{sCert}, diff --git a/test/images/crd-conversion-webhook/converter/BUILD b/test/images/crd-conversion-webhook/converter/BUILD index de5b0dbb94..d3abb152ed 100644 --- a/test/images/crd-conversion-webhook/converter/BUILD +++ b/test/images/crd-conversion-webhook/converter/BUILD @@ -15,7 +15,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library", "//vendor/bitbucket.org/ww/goautoneg:go_default_library", - "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/test/images/crd-conversion-webhook/converter/example_converter.go b/test/images/crd-conversion-webhook/converter/example_converter.go index 9dbb4d817e..b498f5ef9f 100644 --- a/test/images/crd-conversion-webhook/converter/example_converter.go +++ b/test/images/crd-conversion-webhook/converter/example_converter.go @@ -20,14 +20,14 @@ import ( "fmt" "strings" - "github.com/golang/glog" + "k8s.io/klog" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) func convertExampleCRD(Object *unstructured.Unstructured, toVersion string) (*unstructured.Unstructured, metav1.Status) { - glog.V(2).Info("converting crd") + klog.V(2).Info("converting crd") convertedObject := Object.DeepCopy() fromVersion := Object.GetAPIVersion() diff --git a/test/images/crd-conversion-webhook/converter/framework.go b/test/images/crd-conversion-webhook/converter/framework.go index e1a612dd8e..3e20926b8e 100644 --- a/test/images/crd-conversion-webhook/converter/framework.go +++ b/test/images/crd-conversion-webhook/converter/framework.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "github.com/golang/glog" + "k8s.io/klog" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -68,12 +68,12 @@ func doConversion(convertRequest *v1beta1.ConversionRequest, convert convertFunc for _, obj := range convertRequest.Objects { cr := unstructured.Unstructured{} if err := cr.UnmarshalJSON(obj.Raw); err != nil { - glog.Error(err) + klog.Error(err) return conversionResponseFailureWithMessagef("failed to unmarshall object (%v) with error: %v", string(obj.Raw), err) } convertedCR, status := convert(&cr, convertRequest.DesiredAPIVersion) if status.Status != metav1.StatusSuccess { - glog.Error(status.String()) + klog.Error(status.String()) return &v1beta1.ConversionResponse{ Result: status, } @@ -99,21 +99,21 @@ func serve(w http.ResponseWriter, r *http.Request, convert convertFunc) { serializer := getInputSerializer(contentType) if serializer == nil { msg := fmt.Sprintf("invalid Content-Type header `%s`", contentType) - glog.Errorf(msg) + klog.Errorf(msg) http.Error(w, msg, http.StatusBadRequest) return } - glog.V(2).Infof("handling request: %v", body) + klog.V(2).Infof("handling request: %v", body) convertReview := v1beta1.ConversionReview{} if _, _, err := serializer.Decode(body, nil, &convertReview); err != nil { - glog.Error(err) + klog.Error(err) convertReview.Response = conversionResponseFailureWithMessagef("failed to deserialize body (%v) with error %v", string(body), err) } else { convertReview.Response = doConversion(convertReview.Request, convert) convertReview.Response.UID = convertReview.Request.UID } - glog.V(2).Info(fmt.Sprintf("sending response: %v", convertReview.Response)) + klog.V(2).Info(fmt.Sprintf("sending response: %v", convertReview.Response)) // reset the request, it is not needed in a response. convertReview.Request = &v1beta1.ConversionRequest{} @@ -122,13 +122,13 @@ func serve(w http.ResponseWriter, r *http.Request, convert convertFunc) { outSerializer := getOutputSerializer(accept) if outSerializer == nil { msg := fmt.Sprintf("invalid accept header `%s`", accept) - glog.Errorf(msg) + klog.Errorf(msg) http.Error(w, msg, http.StatusBadRequest) return } err := outSerializer.Encode(&convertReview, w) if err != nil { - glog.Error(err) + klog.Error(err) http.Error(w, err.Error(), http.StatusInternalServerError) return }