Skip to content

Commit ebc46a1

Browse files
Merge pull request #89343 from aojea/automated-cherry-pick-of-#89341-upstream-release-1.18
Automated cherry pick of #89341: bump k8s.io utils Kubernetes-commit: a4d1f873dd75a547dff75c9de77bc4dfabc5d4e6
1 parent 6cfe3e0 commit ebc46a1

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

Godeps/Godeps.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+6-7
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ go 1.13
77
require (
88
github.com/spf13/cobra v0.0.5
99
github.com/spf13/pflag v1.0.5
10-
k8s.io/cli-runtime v0.0.0
11-
k8s.io/client-go v0.0.0
10+
k8s.io/cli-runtime v0.0.0-20200323050130-7d08ca53dbfb
11+
k8s.io/client-go v0.0.0-20200323043346-3e3c7a420997
1212
)
1313

1414
replace (
1515
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
1616
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
17-
k8s.io/api => ../api
18-
k8s.io/apimachinery => ../apimachinery
19-
k8s.io/cli-runtime => ../cli-runtime
20-
k8s.io/client-go => ../client-go
21-
k8s.io/sample-cli-plugin => ../sample-cli-plugin
17+
k8s.io/api => k8s.io/api v0.0.0-20200316191010-3b4a996260a0
18+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1
19+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200323050130-7d08ca53dbfb
20+
k8s.io/client-go => k8s.io/client-go v0.0.0-20200323043346-3e3c7a420997
2221
)

go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
224224
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
225225
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
226226
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
227+
k8s.io/api v0.0.0-20200316191010-3b4a996260a0/go.mod h1:dQFmApLGF1AzHBoCa9z1a7ftM/1nZEAoknHzuttq6eY=
228+
k8s.io/apimachinery v0.0.0-20200321205243-105e0c6d63f1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
229+
k8s.io/cli-runtime v0.0.0-20200323050130-7d08ca53dbfb/go.mod h1:dvUOwxzJlSEh+VezITePUURi8LTm1Aw+97pedwJHHGM=
230+
k8s.io/client-go v0.0.0-20200323043346-3e3c7a420997/go.mod h1:+LUFJHRxA/rs1OBdLuGcdVLCZ7FhUbGDI8zl3FqnnGc=
227231
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
228232
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
229233
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

0 commit comments

Comments
 (0)