mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-01 10:48:15 +00:00
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
This commit is contained in:
@@ -22,8 +22,8 @@ import (
|
||||
"strings"
|
||||
|
||||
jsonpatch "github.com/evanphx/json-patch"
|
||||
"github.com/golang/glog"
|
||||
"github.com/spf13/cobra"
|
||||
"k8s.io/klog"
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
@@ -229,10 +229,10 @@ func (o *PatchOptions) RunPatch() error {
|
||||
|
||||
// if the recorder makes a change, compute and create another patch
|
||||
if mergePatch, err := o.Recorder.MakeRecordMergePatch(patchedObj); err != nil {
|
||||
glog.V(4).Infof("error recording current command: %v", err)
|
||||
klog.V(4).Infof("error recording current command: %v", err)
|
||||
} else if len(mergePatch) > 0 {
|
||||
if recordedObj, err := helper.Patch(info.Namespace, info.Name, types.MergePatchType, mergePatch, nil); err != nil {
|
||||
glog.V(4).Infof("error recording reason: %v", err)
|
||||
klog.V(4).Infof("error recording reason: %v", err)
|
||||
} else {
|
||||
patchedObj = recordedObj
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user