From 549b6469ccaa8e0c06d175f0f02e510580ddb642 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sun, 2 Feb 2020 10:22:03 +0100 Subject: [PATCH] upgrading package: drone-runner-kube 1.0.0b0.20191123 -> 1.0.0b1.20200202 --- drone-runner-kube/drone-runner-kube.patch | 69 ----------------------- drone-runner-kube/drone-runner-kube.spec | 16 +++--- 2 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 drone-runner-kube/drone-runner-kube.patch diff --git a/drone-runner-kube/drone-runner-kube.patch b/drone-runner-kube/drone-runner-kube.patch deleted file mode 100644 index d98d24b67e..0000000000 --- a/drone-runner-kube/drone-runner-kube.patch +++ /dev/null @@ -1,69 +0,0 @@ -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)) - } - diff --git a/drone-runner-kube/drone-runner-kube.spec b/drone-runner-kube/drone-runner-kube.spec index 81d9cfe6f8..74b47f302c 100644 --- a/drone-runner-kube/drone-runner-kube.spec +++ b/drone-runner-kube/drone-runner-kube.spec @@ -22,9 +22,9 @@ ## # package version -%define V_opkg 1.0.0b0 -%define V_release 1.0.0-beta.0 -%define V_dist 20191123 +%define V_opkg 1.0.0b1 +%define V_release 1.0.0-beta.1 +%define V_dist 20200202 # package information Name: drone-runner-kube @@ -37,13 +37,12 @@ Class: EVAL Group: Web License: Apache Version: %{V_opkg}.%{V_dist} -Release: 20191123 +Release: 20200202 # list of sources Source0: http://download.openpkg.org/components/versioned/drone/drone-runner-kube-%{V_dist}.tar.xz Source1: rc.drone-runner-kube Source2: drone-runner-kube.sh -Patch0: drone-runner-kube.patch # build information BuildPreReq: OpenPKG, openpkg >= 20160101, go @@ -69,13 +68,13 @@ PreReq: OpenPKG, openpkg >= 20160101 %prep %setup -q -n drone-runner-kube - %patch -p0 %build # build program export GOPATH=`pwd` rm -rf $GOPATH/src/github.com/kube/distribution/vendor/github.com/opencontainers/go-digest - go build -v -o drone-runner-kube github.com/drone-runners/drone-runner-kube/ + cd $GOPATH/src/github.com/drone-runners/drone-runner-kube + go build -v -o drone-runner-kube %install # create installation hierarchy @@ -88,7 +87,8 @@ PreReq: OpenPKG, openpkg >= 20160101 # install program %{l_shtool} install -c -s -m 755 \ - drone-runner-kube $RPM_BUILD_ROOT%{l_prefix}/sbin/ + src/github.com/drone-runners/drone-runner-kube/drone-runner-kube \ + $RPM_BUILD_ROOT%{l_prefix}/sbin/ # install default configuration %{l_shtool} install -c -m 644 %{l_value -s -a} \