Skip to content

Commit c68d654

Browse files
authored
Merge pull request #22503 from deads2k/klog
switch klog
2 parents 8220e17 + ead78d7 commit c68d654

286 files changed

Lines changed: 1763 additions & 1766 deletions

File tree

Some content is hidden

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

cmd/openshift-tests/openshift-tests.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111

1212
"github.com/onsi/gomega"
1313

14-
"github.com/golang/glog"
1514
"github.com/onsi/ginkgo"
1615
"github.com/spf13/cobra"
1716
"github.com/spf13/pflag"
17+
"k8s.io/klog"
1818

1919
"k8s.io/apiserver/pkg/util/logs"
2020
"k8s.io/kubernetes/pkg/kubectl/util/templates"
@@ -283,6 +283,6 @@ func decodeProviderTo(provider string, testContext *e2e.TestContextType) error {
283283
return fmt.Errorf("provider must decode into the cloud config object: %v", err)
284284
}
285285
}
286-
glog.V(2).Infof("Provider %s: %#v", testContext.Provider, testContext.CloudConfig)
286+
klog.V(2).Infof("Provider %s: %#v", testContext.Provider, testContext.CloudConfig)
287287
return nil
288288
}

cmd/template-service-broker/tsb.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"runtime"
88
"time"
99

10-
"github.com/golang/glog"
1110
"github.com/openshift/origin/pkg/version"
11+
"k8s.io/klog"
1212

1313
genericapiserver "k8s.io/apiserver/pkg/server"
1414
"k8s.io/apiserver/pkg/util/logs"
@@ -41,6 +41,6 @@ func main() {
4141
cmd := tsbcmd.NewCommandStartTemplateServiceBrokerServer(os.Stdout, os.Stderr, stopCh)
4242
cmd.Flags().AddGoFlagSet(flag.CommandLine)
4343
if err := cmd.Execute(); err != nil {
44-
glog.Fatal(err)
44+
klog.Fatal(err)
4545
}
4646
}

hack/import-restrictions.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
"allowedImportPackages": [
262262
"vendor/k8s.io/kubernetes/pkg/apis/core",
263263
"vendor/k8s.io/kubernetes/pkg/apis/core/v1",
264-
"vendor/github.com/golang/glog",
264+
"vendor/k8s.io/klog",
265265
"vendor/github.com/blang/semver"
266266
]
267267
},
@@ -416,7 +416,7 @@
416416
"github.com/openshift/origin/pkg/template/servicebroker"
417417
],
418418
"allowedImportPackages": [
419-
"vendor/github.com/golang/glog",
419+
"vendor/k8s.io/klog",
420420
"vendor/k8s.io/api/core/v1",
421421
"vendor/k8s.io/api/authorization/v1",
422422
"vendor/k8s.io/kubernetes/pkg/apis/core",
@@ -455,7 +455,7 @@
455455
"github.com/openshift/origin/pkg/oauthserver"
456456
],
457457
"allowedImportPackages": [
458-
"vendor/github.com/golang/glog",
458+
"vendor/k8s.io/klog",
459459
"vendor/github.com/davecgh/go-spew/spew",
460460
"github.com/openshift/origin/pkg/authorization/authorizer/scope",
461461
"github.com/openshift/origin/pkg/oauth/apis/oauth/validation",
@@ -487,7 +487,7 @@
487487
"vendor/github.com/docker/libtrust",
488488
"vendor/github.com/fsnotify/fsnotify",
489489
"vendor/github.com/fsouza/go-dockerclient",
490-
"vendor/github.com/golang/glog",
490+
"vendor/k8s.io/klog",
491491
"vendor/github.com/gonum/graph",
492492
"vendor/github.com/joho/godotenv",
493493
"vendor/github.com/MakeNowJust/heredoc",

pkg/apiserver/authentication/oauth/timeoutvalidator.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"errors"
55
"time"
66

7-
"github.com/golang/glog"
87
"k8s.io/apimachinery/pkg/util/clock"
8+
"k8s.io/klog"
99

1010
apierrors "k8s.io/apimachinery/pkg/api/errors"
1111
"k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -70,7 +70,7 @@ func NewTimeoutValidator(tokens oauthclient.OAuthAccessTokenInterface, oauthClie
7070
}
7171
a.flushHandler = a.flush
7272
a.putTokenHandler = a.putToken
73-
glog.V(5).Infof("Token Timeout Validator primed with defaultTimeout=%s tickerInterval=%s", a.defaultTimeout, a.tickerInterval)
73+
klog.V(5).Infof("Token Timeout Validator primed with defaultTimeout=%s tickerInterval=%s", a.defaultTimeout, a.tickerInterval)
7474
return a
7575
}
7676

@@ -109,7 +109,7 @@ func (a *TimeoutValidator) putToken(td *tokenData) {
109109
func (a *TimeoutValidator) clientTimeout(name string) time.Duration {
110110
oauthClient, err := a.oauthClients.Get(name)
111111
if err != nil {
112-
glog.V(5).Infof("Failed to fetch OAuthClient %q for timeout value: %v", name, err)
112+
klog.V(5).Infof("Failed to fetch OAuthClient %q for timeout value: %v", name, err)
113113
return a.defaultTimeout
114114
}
115115
if oauthClient.AccessTokenInactivityTimeoutSeconds == nil {
@@ -150,7 +150,7 @@ func (a *TimeoutValidator) flush(flushHorizon time.Time) {
150150
// flush all tokens that are about to expire before the flushHorizon.
151151
// Typically the flushHorizon is set to a time slightly past the next
152152
// ticker interval, so that not token ends up timing out between flushes
153-
glog.V(5).Infof("Flushing tokens timing out before %s", flushHorizon)
153+
klog.V(5).Infof("Flushing tokens timing out before %s", flushHorizon)
154154

155155
// grab all tokens that need to be update in this flush interval
156156
// and remove them from the stored data, they either flush now or never
@@ -167,11 +167,11 @@ func (a *TimeoutValidator) flush(flushHorizon time.Time) {
167167
case err == nil:
168168
flushedTokens++
169169
case apierrors.IsConflict(err) || apierrors.IsServerTimeout(err):
170-
glog.V(5).Infof("Token update deferred for token belonging to %s",
170+
klog.V(5).Infof("Token update deferred for token belonging to %s",
171171
td.token.UserName)
172172
retryList = append(retryList, td)
173173
default:
174-
glog.V(5).Infof("Token timeout for user=%q client=%q scopes=%v was not updated",
174+
klog.V(5).Infof("Token timeout for user=%q client=%q scopes=%v was not updated",
175175
td.token.UserName, td.token.ClientName, td.token.Scopes)
176176
}
177177
}
@@ -181,14 +181,14 @@ func (a *TimeoutValidator) flush(flushHorizon time.Time) {
181181
for _, td := range retryList {
182182
err := a.update(td)
183183
if err != nil {
184-
glog.V(5).Infof("Token timeout for user=%q client=%q scopes=%v was not updated",
184+
klog.V(5).Infof("Token timeout for user=%q client=%q scopes=%v was not updated",
185185
td.token.UserName, td.token.ClientName, td.token.Scopes)
186186
} else {
187187
flushedTokens++
188188
}
189189
}
190190

191-
glog.V(5).Infof("Successfully flushed %d tokens out of %d",
191+
klog.V(5).Infof("Successfully flushed %d tokens out of %d",
192192
flushedTokens, len(tokenList))
193193
}
194194

@@ -200,7 +200,7 @@ func (a *TimeoutValidator) nextTick() time.Time {
200200

201201
func (a *TimeoutValidator) Run(stopCh <-chan struct{}) {
202202
defer runtime.HandleCrash()
203-
glog.V(5).Infof("Started Token Timeout Flush Handling thread!")
203+
klog.V(5).Infof("Started Token Timeout Flush Handling thread!")
204204

205205
ticker := a.clock.NewTicker(a.tickerInterval)
206206
// make sure to kill the ticker when we exit
@@ -219,7 +219,7 @@ func (a *TimeoutValidator) Run(stopCh <-chan struct{}) {
219219
// if this token is going to time out before the timer, flush now
220220
tokenTimeout := td.timeout()
221221
if tokenTimeout.Before(nextTick) {
222-
glog.V(5).Infof("Timeout for user=%q client=%q scopes=%v falls before next ticker (%s < %s), forcing flush!",
222+
klog.V(5).Infof("Timeout for user=%q client=%q scopes=%v falls before next ticker (%s < %s), forcing flush!",
223223
td.token.UserName, td.token.ClientName, td.token.Scopes, tokenTimeout, nextTick)
224224
a.flushHandler(nextTick)
225225
}

pkg/apps/apiserver/registry/deploylog/rest.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"time"
99

10-
"github.com/golang/glog"
10+
"k8s.io/klog"
1111

1212
corev1 "k8s.io/api/core/v1"
1313
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -145,10 +145,10 @@ func (r *REST) Get(ctx context.Context, name string, opts runtime.Object) (runti
145145
switch status {
146146
case appsv1.DeploymentStatusNew, appsv1.DeploymentStatusPending:
147147
if deployLogOpts.NoWait {
148-
glog.V(4).Infof("Deployment %s is in %s state. No logs to retrieve yet.", labelForDeployment, status)
148+
klog.V(4).Infof("Deployment %s is in %s state. No logs to retrieve yet.", labelForDeployment, status)
149149
return &genericrest.LocationStreamer{}, nil
150150
}
151-
glog.V(4).Infof("Deployment %s is in %s state, waiting for it to start...", labelForDeployment, status)
151+
klog.V(4).Infof("Deployment %s is in %s state, waiting for it to start...", labelForDeployment, status)
152152

153153
if err := WaitForRunningDeployerPod(r.podClient, target, r.timeout); err != nil {
154154
return nil, apierrors.NewBadRequest(fmt.Sprintf("failed to run deployer pod %s: %v", podName, err))

pkg/apps/apiserver/registry/deploylog/wait.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"time"
88

9-
"github.com/golang/glog"
9+
"k8s.io/klog"
1010

1111
corev1 "k8s.io/api/core/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -43,7 +43,7 @@ func WaitForRunningDeployment(rn corev1client.ReplicationControllersGetter, obse
4343
switch t := e.Object.(type) {
4444
case *metav1.Status:
4545
if t.Reason == metav1.StatusReasonGone {
46-
glog.V(5).Infof("encountered error while watching for replication controller: %v (retrying)", t)
46+
klog.V(5).Infof("encountered error while watching for replication controller: %v (retrying)", t)
4747
return false, ErrTooOldResourceVersion
4848
}
4949
}

pkg/apps/apiserver/registry/instantiate/rest.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/golang/glog"
7+
"k8s.io/klog"
88

99
"k8s.io/apimachinery/pkg/api/errors"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -91,7 +91,7 @@ func (s *REST) Create(ctx context.Context, obj runtime.Object, createValidation
9191
}
9292
return nil
9393
}
94-
glog.V(4).Infof("New deployment for %q caused by %#v", config.Name, causes)
94+
klog.V(4).Infof("New deployment for %q caused by %#v", config.Name, causes)
9595

9696
config.Status.Details = new(appsapi.DeploymentDetails)
9797
config.Status.Details.Causes = causes
@@ -350,7 +350,7 @@ func hasUpdatedTriggers(current, previous appsapi.DeploymentConfig) bool {
350350
}
351351
}
352352
if !found {
353-
glog.V(4).Infof("Deployment config %s/%s current version contains new trigger %#v", current.Namespace, current.Name, ct)
353+
klog.V(4).Infof("Deployment config %s/%s current version contains new trigger %#v", current.Namespace, current.Name, ct)
354354
return true
355355
}
356356
}
@@ -372,7 +372,7 @@ func triggeredByDifferentImage(ictParams appsapi.DeploymentTriggerImageChangePar
372372
}
373373

374374
if t.ImageChangeParams.LastTriggeredImage != ictParams.LastTriggeredImage {
375-
glog.V(4).Infof("Deployment config %s/%s triggered by different image: %s -> %s", previous.Namespace, previous.Name, t.ImageChangeParams.LastTriggeredImage, ictParams.LastTriggeredImage)
375+
klog.V(4).Infof("Deployment config %s/%s triggered by different image: %s -> %s", previous.Namespace, previous.Name, t.ImageChangeParams.LastTriggeredImage, ictParams.LastTriggeredImage)
376376
return true
377377
}
378378
return false

pkg/apps/controller/deployer/deployer_controller.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package deployment
33
import (
44
"fmt"
55

6-
"github.com/golang/glog"
6+
"k8s.io/klog"
77
"k8s.io/kubernetes/pkg/api/legacyscheme"
88

99
corev1 "k8s.io/api/core/v1"
@@ -140,7 +140,7 @@ func (c *DeploymentController) handle(deployment *corev1.ReplicationController,
140140
nextStatus = appsv1.DeploymentStatusFailed
141141
updatedAnnotations[appsv1.DeploymentStatusReasonAnnotation] = appsutil.DeploymentFailedUnableToCreateDeployerPod
142142
c.emitDeploymentEvent(deployment, corev1.EventTypeWarning, "RolloutTimeout", fmt.Sprintf("Rollout for %q failed to create deployer pod (timeoutSeconds: %ds)", appsutil.LabelForDeployment(deployment), appsutil.GetTimeoutSecondsForStrategy(config)))
143-
glog.V(4).Infof("Failing deployment %s/%s as we reached timeout while waiting for the deployer pod to be created", deployment.Namespace, deployment.Name)
143+
klog.V(4).Infof("Failing deployment %s/%s as we reached timeout while waiting for the deployer pod to be created", deployment.Namespace, deployment.Name)
144144
break
145145
}
146146

@@ -170,7 +170,7 @@ func (c *DeploymentController) handle(deployment *corev1.ReplicationController,
170170
updatedAnnotations[appsv1.DeployerPodStartedAtAnnotation] = deploymentPod.Status.StartTime.String()
171171
}
172172
nextStatus = appsv1.DeploymentStatusPending
173-
glog.V(4).Infof("Created deployer pod %q for %q", deploymentPod.Name, appsutil.LabelForDeployment(deployment))
173+
klog.V(4).Infof("Created deployer pod %q for %q", deploymentPod.Name, appsutil.LabelForDeployment(deployment))
174174

175175
// Most likely dead code since we never get an error different from 404 back from the cache.
176176
case deployerErr != nil:
@@ -284,7 +284,7 @@ func (c *DeploymentController) handle(deployment *corev1.ReplicationController,
284284
if _, err := c.rn.ReplicationControllers(deploymentCopy.Namespace).Update(deploymentCopy); err != nil {
285285
return fmt.Errorf("couldn't update rollout status for %q to %s: %v", appsutil.LabelForDeployment(deploymentCopy), nextStatus, err)
286286
}
287-
glog.V(4).Infof("Updated rollout status for %q from %s to %s (scale: %d)", appsutil.LabelForDeployment(deploymentCopy), currentStatus, nextStatus, *deploymentCopy.Spec.Replicas)
287+
klog.V(4).Infof("Updated rollout status for %q from %s to %s (scale: %d)", appsutil.LabelForDeployment(deploymentCopy), currentStatus, nextStatus, *deploymentCopy.Spec.Replicas)
288288

289289
if appsutil.IsDeploymentCancelled(deploymentCopy) && appsutil.IsFailedDeployment(deploymentCopy) {
290290
c.emitDeploymentEvent(deploymentCopy, corev1.EventTypeNormal, "RolloutCancelled", fmt.Sprintf("Rollout for %q cancelled", appsutil.LabelForDeployment(deploymentCopy)))
@@ -468,7 +468,7 @@ func (c *DeploymentController) makeDeployerContainer(strategy *appsv1.Deployment
468468
// TODO: The size of environment value should be probably validated in k8s api validation
469469
// as when the env var size is more than 128kb the execve calls will fail.
470470
if len(env.Value) > maxInjectedEnvironmentAllowedSize {
471-
glog.Errorf("failed to inject %s environment variable as the size exceed %d bytes", env.Name, maxInjectedEnvironmentAllowedSize)
471+
klog.Errorf("failed to inject %s environment variable as the size exceed %d bytes", env.Name, maxInjectedEnvironmentAllowedSize)
472472
continue
473473
}
474474
environment = append(environment, env)
@@ -492,14 +492,14 @@ func (c *DeploymentController) setDeployerPodsOwnerRef(deployment *corev1.Replic
492492
}
493493

494494
encoder := legacyscheme.Codecs.LegacyCodec(legacyscheme.Scheme.PrioritizedVersionsAllGroups()...)
495-
glog.V(4).Infof("deployment %s/%s owning %d pods", deployment.Namespace, deployment.Name, len(deployerPodsList))
495+
klog.V(4).Infof("deployment %s/%s owning %d pods", deployment.Namespace, deployment.Name, len(deployerPodsList))
496496

497497
var errors []error
498498
for _, pod := range deployerPodsList {
499499
if len(pod.OwnerReferences) > 0 {
500500
continue
501501
}
502-
glog.V(4).Infof("setting ownerRef for pod %s/%s to deployment %s/%s", pod.Namespace, pod.Name, deployment.Namespace, deployment.Name)
502+
klog.V(4).Infof("setting ownerRef for pod %s/%s to deployment %s/%s", pod.Namespace, pod.Name, deployment.Namespace, deployment.Name)
503503
newPod := pod.DeepCopy()
504504
newPod.SetOwnerReferences([]metav1.OwnerReference{{
505505
APIVersion: "v1",
@@ -580,6 +580,6 @@ func (c *DeploymentController) handleErr(err error, key interface{}, deployment
580580
if _, isActionableErr := err.(actionableError); isActionableErr {
581581
c.emitDeploymentEvent(deployment, corev1.EventTypeWarning, "FailedRetry", msg)
582582
}
583-
glog.V(2).Infof(msg)
583+
klog.V(2).Infof(msg)
584584
c.queue.Forget(key)
585585
}

pkg/apps/controller/deployer/factory.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/golang/glog"
87
"k8s.io/api/core/v1"
98
"k8s.io/apimachinery/pkg/api/errors"
109
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -15,6 +14,7 @@ import (
1514
"k8s.io/client-go/tools/cache"
1615
"k8s.io/client-go/tools/record"
1716
"k8s.io/client-go/util/workqueue"
17+
"k8s.io/klog"
1818
"k8s.io/kubernetes/pkg/api/legacyscheme"
1919
kcontroller "k8s.io/kubernetes/pkg/controller"
2020

@@ -31,7 +31,7 @@ func NewDeployerController(
3131
env []v1.EnvVar,
3232
) *DeploymentController {
3333
eventBroadcaster := record.NewBroadcaster()
34-
eventBroadcaster.StartLogging(glog.Infof)
34+
eventBroadcaster.StartLogging(klog.Infof)
3535
eventBroadcaster.StartRecordingToSink(&kv1core.EventSinkImpl{Interface: kubeClientset.CoreV1().Events("")})
3636
recorder := eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: "deployer-controller"})
3737

@@ -70,22 +70,22 @@ func (c *DeploymentController) Run(workers int, stopCh <-chan struct{}) {
7070
defer utilruntime.HandleCrash()
7171
defer c.queue.ShutDown()
7272

73-
glog.Infof("Starting deployer controller")
73+
klog.Infof("Starting deployer controller")
7474

7575
// Wait for the dc store to sync before starting any work in this controller.
7676
if !cache.WaitForCacheSync(stopCh, c.rcListerSynced, c.podListerSynced) {
7777
return
7878
}
7979

80-
glog.Infof("Deployer controller caches are synced. Starting workers.")
80+
klog.Infof("Deployer controller caches are synced. Starting workers.")
8181

8282
for i := 0; i < workers; i++ {
8383
go wait.Until(c.worker, time.Second, stopCh)
8484
}
8585

8686
<-stopCh
8787

88-
glog.Infof("Shutting down deployer controller")
88+
klog.Infof("Shutting down deployer controller")
8989
}
9090

9191
func (c *DeploymentController) addReplicationController(obj interface{}) {
@@ -204,11 +204,11 @@ func (c *DeploymentController) getByKey(key string) (*v1.ReplicationController,
204204
rc, err := c.rcLister.ReplicationControllers(namespace).Get(name)
205205
if errors.IsNotFound(err) {
206206
// TODO tnozicka: this is not normal and should be refactored
207-
glog.V(4).Infof("Replication controller %q has been deleted", key)
207+
klog.V(4).Infof("Replication controller %q has been deleted", key)
208208
return nil, nil
209209
}
210210
if err != nil {
211-
glog.Infof("Unable to retrieve replication controller %q from store: %v", key, err)
211+
klog.Infof("Unable to retrieve replication controller %q from store: %v", key, err)
212212
c.queue.AddRateLimited(key)
213213
return nil, err
214214
}

pkg/apps/controller/deploymentconfig/controller_ref_manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package deploymentconfig
33
import (
44
"fmt"
55

6-
"github.com/golang/glog"
76
"k8s.io/api/core/v1"
87
kerrors "k8s.io/apimachinery/pkg/api/errors"
98
kmetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -13,6 +12,7 @@ import (
1312
kutilerrors "k8s.io/apimachinery/pkg/util/errors"
1413
kclientset "k8s.io/client-go/kubernetes"
1514
"k8s.io/client-go/tools/record"
15+
"k8s.io/klog"
1616
kcontroller "k8s.io/kubernetes/pkg/controller"
1717
)
1818

@@ -152,7 +152,7 @@ func (m *RCControllerRefManager) AdoptReplicationController(rs *v1.ReplicationCo
152152
// ReleaseReplicationController sends a patch to free the ReplicationController from the control of the Deployment controller.
153153
// It returns the error if the patching fails. 404 and 422 errors are ignored.
154154
func (m *RCControllerRefManager) ReleaseReplicationController(rc *v1.ReplicationController) error {
155-
glog.V(4).Infof("patching ReplicationController %s/%s to remove its controllerRef to %s/%s:%s",
155+
klog.V(4).Infof("patching ReplicationController %s/%s to remove its controllerRef to %s/%s:%s",
156156
rc.Namespace, rc.Name, m.controllerKind.GroupVersion(), m.controllerKind.Kind, m.Controller.GetName())
157157
deleteOwnerRefPatch := fmt.Sprintf(`{"metadata":{"ownerReferences":[{"$patch":"delete","uid":"%s"}],"uid":"%s"}}`, m.Controller.GetUID(), rc.UID)
158158
err := m.rcControl.PatchReplicationController(rc.Namespace, rc.Name, []byte(deleteOwnerRefPatch))

0 commit comments

Comments
 (0)