You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
3.3 KiB
80 lines
3.3 KiB
Index: src/github.com/drone/drone-runtime/engine/kube/kube.go |
|
--- src/github.com/drone/drone-runtime/engine/kube/kube.go.orig 2019-11-15 20:27:19.000000000 +0100 |
|
+++ src/github.com/drone/drone-runtime/engine/kube/kube.go 2019-11-15 22:25:45.722597000 +0100 |
|
@@ -188,7 +188,6 @@ |
|
<-stopper |
|
|
|
pod, err := e.client.CoreV1().Pods(spec.Metadata.Namespace).Get(step.Metadata.UID, metav1.GetOptions{ |
|
- IncludeUninitialized: true, |
|
}) |
|
if err != nil { |
|
return nil, err |
|
Index: src/k8s.io/client-go/rest/request.go |
|
--- src/k8s.io/client-go/rest/request.go.orig 2019-11-15 20:29:10.000000000 +0100 |
|
+++ src/k8s.io/client-go/rest/request.go 2019-11-15 22:23:42.601863000 +0100 |
|
@@ -989,11 +989,11 @@ |
|
func truncateBody(body string) string { |
|
max := 0 |
|
switch { |
|
- case bool(klog.V(10)): |
|
+ case bool(klog.V(10).Enabled()): |
|
return body |
|
- case bool(klog.V(9)): |
|
+ case bool(klog.V(9).Enabled()): |
|
max = 10240 |
|
- case bool(klog.V(8)): |
|
+ case bool(klog.V(8).Enabled()): |
|
max = 1024 |
|
} |
|
|
|
@@ -1008,7 +1008,7 @@ |
|
// allocating a new string for the body output unless necessary. Uses a simple heuristic to determine |
|
// whether the body is printable. |
|
func glogBody(prefix string, body []byte) { |
|
- if klog.V(8) { |
|
+ if klog.V(8).Enabled() { |
|
if bytes.IndexFunc(body, func(r rune) bool { |
|
return r < 0x0a |
|
}) != -1 { |
|
Index: src/k8s.io/client-go/transport/round_trippers.go |
|
--- src/k8s.io/client-go/transport/round_trippers.go.orig 2019-11-15 20:29:10.000000000 +0100 |
|
+++ src/k8s.io/client-go/transport/round_trippers.go 2019-11-15 22:23:42.602042000 +0100 |
|
@@ -67,13 +67,13 @@ |
|
// DebugWrappers wraps a round tripper and logs based on the current log level. |
|
func DebugWrappers(rt http.RoundTripper) http.RoundTripper { |
|
switch { |
|
- case bool(klog.V(9)): |
|
+ case bool(klog.V(9).Enabled()): |
|
rt = newDebuggingRoundTripper(rt, debugCurlCommand, debugURLTiming, debugResponseHeaders) |
|
- case bool(klog.V(8)): |
|
+ case bool(klog.V(8).Enabled()): |
|
rt = newDebuggingRoundTripper(rt, debugJustURL, debugRequestHeaders, debugResponseStatus, debugResponseHeaders) |
|
- case bool(klog.V(7)): |
|
+ case bool(klog.V(7).Enabled()): |
|
rt = newDebuggingRoundTripper(rt, debugJustURL, debugRequestHeaders, debugResponseStatus) |
|
- case bool(klog.V(6)): |
|
+ case bool(klog.V(6).Enabled()): |
|
rt = newDebuggingRoundTripper(rt, debugURLTiming) |
|
} |
|
|
|
Index: src/k8s.io/utils/trace/trace.go |
|
--- src/k8s.io/utils/trace/trace.go.orig 2019-11-15 20:29:27.000000000 +0100 |
|
+++ src/k8s.io/utils/trace/trace.go 2019-11-15 22:23:42.602173000 +0100 |
|
@@ -97,7 +97,7 @@ |
|
lastStepTime := t.startTime |
|
for _, step := range t.steps { |
|
stepDuration := step.stepTime.Sub(lastStepTime) |
|
- if stepThreshold == 0 || stepDuration > stepThreshold || klog.V(4) { |
|
+ if stepThreshold == 0 || stepDuration > stepThreshold || klog.V(4).Enabled() { |
|
buffer.WriteString(fmt.Sprintf("Trace[%d]: [%v] [%v] ", tracenum, step.stepTime.Sub(t.startTime), stepDuration)) |
|
buffer.WriteString(step.msg) |
|
if len(step.fields) > 0 { |
|
@@ -109,7 +109,7 @@ |
|
lastStepTime = step.stepTime |
|
} |
|
stepDuration := endTime.Sub(lastStepTime) |
|
- if stepThreshold == 0 || stepDuration > stepThreshold || klog.V(4) { |
|
+ if stepThreshold == 0 || stepDuration > stepThreshold || klog.V(4).Enabled() { |
|
buffer.WriteString(fmt.Sprintf("Trace[%d]: [%v] [%v] END\n", tracenum, endTime.Sub(t.startTime), stepDuration)) |
|
} |
|
|
|
|