Skip to content

Commit 74cd8bb

Browse files
dimsk8s-publishing-bot
dims
authored and
k8s-publishing-bot
committed
Move from glog to klog
- Move from the old github.com/golang/glog to k8s.io/klog - klog as explicit InitFlags() so we add them as necessary - we update the other repositories that we vendor that made a similar change from glog to klog * github.com/kubernetes/repo-infra * k8s.io/gengo/ * k8s.io/kube-openapi/ * github.com/google/cadvisor - Entirely remove all references to glog - Fix some tests by explicit InitFlags in their init() methods Change-Id: I92db545ff36fcec83afe98f550c9e630098b3135 Kubernetes-commit: 954996e231074dc7429f7be1256a579bedd8344c
1 parent b1c1d2e commit 74cd8bb

38 files changed

+262
-262
lines changed

‎Godeps/Godeps.json

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

‎discovery/cached_discovery.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"sync"
2626
"time"
2727

28-
"github.com/golang/glog"
2928
"github.com/googleapis/gnostic/OpenAPIv2"
29+
"k8s.io/klog"
3030

3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/runtime"
@@ -67,23 +67,23 @@ func (d *CachedDiscoveryClient) ServerResourcesForGroupVersion(groupVersion stri
6767
if err == nil {
6868
cachedResources := &metav1.APIResourceList{}
6969
if err := runtime.DecodeInto(scheme.Codecs.UniversalDecoder(), cachedBytes, cachedResources); err == nil {
70-
glog.V(10).Infof("returning cached discovery info from %v", filename)
70+
klog.V(10).Infof("returning cached discovery info from %v", filename)
7171
return cachedResources, nil
7272
}
7373
}
7474

7575
liveResources, err := d.delegate.ServerResourcesForGroupVersion(groupVersion)
7676
if err != nil {
77-
glog.V(3).Infof("skipped caching discovery info due to %v", err)
77+
klog.V(3).Infof("skipped caching discovery info due to %v", err)
7878
return liveResources, err
7979
}
8080
if liveResources == nil || len(liveResources.APIResources) == 0 {
81-
glog.V(3).Infof("skipped caching discovery info, no resources found")
81+
klog.V(3).Infof("skipped caching discovery info, no resources found")
8282
return liveResources, err
8383
}
8484

8585
if err := d.writeCachedFile(filename, liveResources); err != nil {
86-
glog.V(1).Infof("failed to write cache to %v due to %v", filename, err)
86+
klog.V(1).Infof("failed to write cache to %v due to %v", filename, err)
8787
}
8888

8989
return liveResources, nil
@@ -103,23 +103,23 @@ func (d *CachedDiscoveryClient) ServerGroups() (*metav1.APIGroupList, error) {
103103
if err == nil {
104104
cachedGroups := &metav1.APIGroupList{}
105105
if err := runtime.DecodeInto(scheme.Codecs.UniversalDecoder(), cachedBytes, cachedGroups); err == nil {
106-
glog.V(10).Infof("returning cached discovery info from %v", filename)
106+
klog.V(10).Infof("returning cached discovery info from %v", filename)
107107
return cachedGroups, nil
108108
}
109109
}
110110

111111
liveGroups, err := d.delegate.ServerGroups()
112112
if err != nil {
113-
glog.V(3).Infof("skipped caching discovery info due to %v", err)
113+
klog.V(3).Infof("skipped caching discovery info due to %v", err)
114114
return liveGroups, err
115115
}
116116
if liveGroups == nil || len(liveGroups.Groups) == 0 {
117-
glog.V(3).Infof("skipped caching discovery info, no groups found")
117+
klog.V(3).Infof("skipped caching discovery info, no groups found")
118118
return liveGroups, err
119119
}
120120

121121
if err := d.writeCachedFile(filename, liveGroups); err != nil {
122-
glog.V(1).Infof("failed to write cache to %v due to %v", filename, err)
122+
klog.V(1).Infof("failed to write cache to %v due to %v", filename, err)
123123
}
124124

125125
return liveGroups, nil

‎discovery/round_tripper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"net/http"
2121
"path/filepath"
2222

23-
"github.com/golang/glog"
2423
"github.com/gregjones/httpcache"
2524
"github.com/gregjones/httpcache/diskcache"
2625
"github.com/peterbourgon/diskv"
26+
"k8s.io/klog"
2727
)
2828

2929
type cacheRoundTripper struct {
@@ -55,7 +55,7 @@ func (rt *cacheRoundTripper) CancelRequest(req *http.Request) {
5555
if cr, ok := rt.rt.Transport.(canceler); ok {
5656
cr.CancelRequest(req)
5757
} else {
58-
glog.Errorf("CancelRequest not implemented by %T", rt.rt.Transport)
58+
klog.Errorf("CancelRequest not implemented by %T", rt.rt.Transport)
5959
}
6060
}
6161

‎examples/workqueue/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"time"
2323

24-
"github.com/golang/glog"
24+
"k8s.io/klog"
2525

2626
"k8s.io/api/core/v1"
2727
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -72,7 +72,7 @@ func (c *Controller) processNextItem() bool {
7272
func (c *Controller) syncToStdout(key string) error {
7373
obj, exists, err := c.indexer.GetByKey(key)
7474
if err != nil {
75-
glog.Errorf("Fetching object with key %s from store failed with %v", key, err)
75+
klog.Errorf("Fetching object with key %s from store failed with %v", key, err)
7676
return err
7777
}
7878

@@ -99,7 +99,7 @@ func (c *Controller) handleErr(err error, key interface{}) {
9999

100100
// This controller retries 5 times if something goes wrong. After that, it stops trying.
101101
if c.queue.NumRequeues(key) < 5 {
102-
glog.Infof("Error syncing pod %v: %v", key, err)
102+
klog.Infof("Error syncing pod %v: %v", key, err)
103103

104104
// Re-enqueue the key rate limited. Based on the rate limiter on the
105105
// queue and the re-enqueue history, the key will be processed later again.
@@ -110,15 +110,15 @@ func (c *Controller) handleErr(err error, key interface{}) {
110110
c.queue.Forget(key)
111111
// Report to an external entity that, even after several retries, we could not successfully process this key
112112
runtime.HandleError(err)
113-
glog.Infof("Dropping pod %q out of the queue: %v", key, err)
113+
klog.Infof("Dropping pod %q out of the queue: %v", key, err)
114114
}
115115

116116
func (c *Controller) Run(threadiness int, stopCh chan struct{}) {
117117
defer runtime.HandleCrash()
118118

119119
// Let the workers stop when we are done
120120
defer c.queue.ShutDown()
121-
glog.Info("Starting Pod controller")
121+
klog.Info("Starting Pod controller")
122122

123123
go c.informer.Run(stopCh)
124124

@@ -133,7 +133,7 @@ func (c *Controller) Run(threadiness int, stopCh chan struct{}) {
133133
}
134134

135135
<-stopCh
136-
glog.Info("Stopping Pod controller")
136+
klog.Info("Stopping Pod controller")
137137
}
138138

139139
func (c *Controller) runWorker() {
@@ -152,13 +152,13 @@ func main() {
152152
// creates the connection
153153
config, err := clientcmd.BuildConfigFromFlags(master, kubeconfig)
154154
if err != nil {
155-
glog.Fatal(err)
155+
klog.Fatal(err)
156156
}
157157

158158
// creates the clientset
159159
clientset, err := kubernetes.NewForConfig(config)
160160
if err != nil {
161-
glog.Fatal(err)
161+
klog.Fatal(err)
162162
}
163163

164164
// create the pod watcher

‎listers/policy/v1beta1/poddisruptionbudget_expansion.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package v1beta1
1919
import (
2020
"fmt"
2121

22-
"github.com/golang/glog"
2322
"k8s.io/api/core/v1"
2423
policy "k8s.io/api/policy/v1beta1"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2625
"k8s.io/apimachinery/pkg/labels"
26+
"k8s.io/klog"
2727
)
2828

2929
// PodDisruptionBudgetListerExpansion allows custom methods to be added to
@@ -54,7 +54,7 @@ func (s *podDisruptionBudgetLister) GetPodPodDisruptionBudgets(pod *v1.Pod) ([]*
5454
pdb := list[i]
5555
selector, err = metav1.LabelSelectorAsSelector(pdb.Spec.Selector)
5656
if err != nil {
57-
glog.Warningf("invalid selector: %v", err)
57+
klog.Warningf("invalid selector: %v", err)
5858
// TODO(mml): add an event to the PDB
5959
continue
6060
}

‎plugin/pkg/client/auth/azure/azure.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/Azure/go-autorest/autorest"
2828
"github.com/Azure/go-autorest/autorest/adal"
2929
"github.com/Azure/go-autorest/autorest/azure"
30-
"github.com/golang/glog"
30+
"k8s.io/klog"
3131

3232
"k8s.io/apimachinery/pkg/util/net"
3333
restclient "k8s.io/client-go/rest"
@@ -50,7 +50,7 @@ const (
5050

5151
func init() {
5252
if err := restclient.RegisterAuthProviderPlugin("azure", newAzureAuthProvider); err != nil {
53-
glog.Fatalf("Failed to register azure auth plugin: %v", err)
53+
klog.Fatalf("Failed to register azure auth plugin: %v", err)
5454
}
5555
}
5656

@@ -124,7 +124,7 @@ func (r *azureRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
124124

125125
token, err := r.tokenSource.Token()
126126
if err != nil {
127-
glog.Errorf("Failed to acquire a token: %v", err)
127+
klog.Errorf("Failed to acquire a token: %v", err)
128128
return nil, fmt.Errorf("acquiring a token for authorization header: %v", err)
129129
}
130130

‎plugin/pkg/client/auth/exec/exec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"sync"
3232
"time"
3333

34-
"github.com/golang/glog"
3534
"golang.org/x/crypto/ssh/terminal"
3635
"k8s.io/apimachinery/pkg/apis/meta/v1"
3736
"k8s.io/apimachinery/pkg/runtime"
@@ -44,6 +43,7 @@ import (
4443
"k8s.io/client-go/tools/clientcmd/api"
4544
"k8s.io/client-go/transport"
4645
"k8s.io/client-go/util/connrotation"
46+
"k8s.io/klog"
4747
)
4848

4949
const execInfoEnv = "KUBERNETES_EXEC_INFO"
@@ -228,7 +228,7 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
228228
Code: int32(res.StatusCode),
229229
}
230230
if err := r.a.maybeRefreshCreds(creds, resp); err != nil {
231-
glog.Errorf("refreshing credentials: %v", err)
231+
klog.Errorf("refreshing credentials: %v", err)
232232
}
233233
}
234234
return res, nil

‎plugin/pkg/client/auth/gcp/gcp.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ import (
2727
"sync"
2828
"time"
2929

30-
"github.com/golang/glog"
3130
"golang.org/x/oauth2"
3231
"golang.org/x/oauth2/google"
3332
"k8s.io/apimachinery/pkg/util/net"
3433
"k8s.io/apimachinery/pkg/util/yaml"
3534
restclient "k8s.io/client-go/rest"
3635
"k8s.io/client-go/util/jsonpath"
36+
"k8s.io/klog"
3737
)
3838

3939
func init() {
4040
if err := restclient.RegisterAuthProviderPlugin("gcp", newGCPAuthProvider); err != nil {
41-
glog.Fatalf("Failed to register gcp auth plugin: %v", err)
41+
klog.Fatalf("Failed to register gcp auth plugin: %v", err)
4242
}
4343
}
4444

@@ -223,7 +223,7 @@ func (t *cachedTokenSource) Token() (*oauth2.Token, error) {
223223
cache := t.update(tok)
224224
if t.persister != nil {
225225
if err := t.persister.Persist(cache); err != nil {
226-
glog.V(4).Infof("Failed to persist token: %v", err)
226+
klog.V(4).Infof("Failed to persist token: %v", err)
227227
}
228228
}
229229
return tok, nil
@@ -329,7 +329,7 @@ func (c *commandTokenSource) parseTokenCmdOutput(output []byte) (*oauth2.Token,
329329
}
330330
var expiry time.Time
331331
if t, err := time.Parse(c.timeFmt, expiryStr); err != nil {
332-
glog.V(4).Infof("Failed to parse token expiry from %s (fmt=%s): %v", expiryStr, c.timeFmt, err)
332+
klog.V(4).Infof("Failed to parse token expiry from %s (fmt=%s): %v", expiryStr, c.timeFmt, err)
333333
} else {
334334
expiry = t
335335
}
@@ -373,7 +373,7 @@ func (t *conditionalTransport) RoundTrip(req *http.Request) (*http.Response, err
373373
}
374374

375375
if res.StatusCode == 401 {
376-
glog.V(4).Infof("The credentials that were supplied are invalid for the target cluster")
376+
klog.V(4).Infof("The credentials that were supplied are invalid for the target cluster")
377377
t.persister.Persist(t.resetCache)
378378
}
379379

‎plugin/pkg/client/auth/oidc/oidc.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828
"sync"
2929
"time"
3030

31-
"github.com/golang/glog"
3231
"golang.org/x/oauth2"
3332
"k8s.io/apimachinery/pkg/util/net"
3433
restclient "k8s.io/client-go/rest"
34+
"k8s.io/klog"
3535
)
3636

3737
const (
@@ -49,7 +49,7 @@ const (
4949

5050
func init() {
5151
if err := restclient.RegisterAuthProviderPlugin("oidc", newOIDCAuthProvider); err != nil {
52-
glog.Fatalf("Failed to register oidc auth plugin: %v", err)
52+
klog.Fatalf("Failed to register oidc auth plugin: %v", err)
5353
}
5454
}
5555

@@ -124,7 +124,7 @@ func newOIDCAuthProvider(_ string, cfg map[string]string, persister restclient.A
124124
}
125125

126126
if len(cfg[cfgExtraScopes]) > 0 {
127-
glog.V(2).Infof("%s auth provider field depricated, refresh request don't send scopes",
127+
klog.V(2).Infof("%s auth provider field depricated, refresh request don't send scopes",
128128
cfgExtraScopes)
129129
}
130130

‎plugin/pkg/client/auth/openstack/openstack.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ import (
2222
"sync"
2323
"time"
2424

25-
"github.com/golang/glog"
2625
"github.com/gophercloud/gophercloud"
2726
"github.com/gophercloud/gophercloud/openstack"
27+
"k8s.io/klog"
2828

2929
"k8s.io/apimachinery/pkg/util/net"
3030
restclient "k8s.io/client-go/rest"
3131
)
3232

3333
func init() {
3434
if err := restclient.RegisterAuthProviderPlugin("openstack", newOpenstackAuthProvider); err != nil {
35-
glog.Fatalf("Failed to register openstack auth plugin: %s", err)
35+
klog.Fatalf("Failed to register openstack auth plugin: %s", err)
3636
}
3737
}
3838

@@ -62,7 +62,7 @@ func (t *tokenGetter) Token() (string, error) {
6262
var err error
6363
if t.authOpt == nil {
6464
// reads the config from the environment
65-
glog.V(4).Info("reading openstack config from the environment variables")
65+
klog.V(4).Info("reading openstack config from the environment variables")
6666
options, err = openstack.AuthOptionsFromEnv()
6767
if err != nil {
6868
return "", fmt.Errorf("failed to read openstack env vars: %s", err)
@@ -126,7 +126,7 @@ func (t *tokenRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
126126
if err == nil {
127127
req.Header.Set("Authorization", "Bearer "+token)
128128
} else {
129-
glog.V(4).Infof("failed to get token: %s", err)
129+
klog.V(4).Infof("failed to get token: %s", err)
130130
}
131131

132132
return t.RoundTripper.RoundTrip(req)
@@ -140,7 +140,7 @@ func newOpenstackAuthProvider(_ string, config map[string]string, persister rest
140140
var ttlDuration time.Duration
141141
var err error
142142

143-
glog.Warningf("WARNING: in-tree openstack auth plugin is now deprecated. please use the \"client-keystone-auth\" kubectl/client-go credential plugin instead")
143+
klog.Warningf("WARNING: in-tree openstack auth plugin is now deprecated. please use the \"client-keystone-auth\" kubectl/client-go credential plugin instead")
144144
ttl, found := config["ttl"]
145145
if !found {
146146
ttlDuration = DefaultTTLDuration

‎rest/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import (
2929
"strings"
3030
"time"
3131

32-
"github.com/golang/glog"
3332
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3433
"k8s.io/apimachinery/pkg/runtime"
3534
"k8s.io/apimachinery/pkg/runtime/schema"
3635
"k8s.io/client-go/pkg/version"
3736
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
3837
certutil "k8s.io/client-go/util/cert"
3938
"k8s.io/client-go/util/flowcontrol"
39+
"k8s.io/klog"
4040
)
4141

4242
const (
@@ -331,7 +331,7 @@ func InClusterConfig() (*Config, error) {
331331
tlsClientConfig := TLSClientConfig{}
332332

333333
if _, err := certutil.NewPool(rootCAFile); err != nil {
334-
glog.Errorf("Expected to load root CA config from %s, but got err: %v", rootCAFile, err)
334+
klog.Errorf("Expected to load root CA config from %s, but got err: %v", rootCAFile, err)
335335
} else {
336336
tlsClientConfig.CAFile = rootCAFile
337337
}

‎rest/plugin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"sync"
2323

24-
"github.com/golang/glog"
24+
"k8s.io/klog"
2525

2626
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
2727
)
@@ -57,7 +57,7 @@ func RegisterAuthProviderPlugin(name string, plugin Factory) error {
5757
if _, found := plugins[name]; found {
5858
return fmt.Errorf("Auth Provider Plugin %q was registered twice", name)
5959
}
60-
glog.V(4).Infof("Registered Auth Provider Plugin %q", name)
60+
klog.V(4).Infof("Registered Auth Provider Plugin %q", name)
6161
plugins[name] = plugin
6262
return nil
6363
}

0 commit comments

Comments
 (0)