Merge pull request #89962 from wangrzneu/master

make kubectl/kubeadm completion script support busybox

Kubernetes-commit: 86a9087896faa476f1d6377a5e0a7882bd838b3f
This commit is contained in:
Kubernetes Publisher 2020-09-22 12:21:23 -07:00
commit 129c63b3d6
4 changed files with 5 additions and 5 deletions

2
Godeps/Godeps.json generated
View file

@ -760,7 +760,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "52bf62410745"
"Rev": "d9d0f5541ae1"
},
{
"ImportPath": "k8s.io/apimachinery",

4
go.mod
View file

@ -34,7 +34,7 @@ require (
github.com/stretchr/testify v1.4.0
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200914174313-52bf62410745
k8s.io/api v0.0.0-20200921235740-d9d0f5541ae1
k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b
k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2
k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29
@ -48,7 +48,7 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20200914174313-52bf62410745
k8s.io/api => k8s.io/api v0.0.0-20200921235740-d9d0f5541ae1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2
k8s.io/client-go => k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29

2
go.sum
View file

@ -503,7 +503,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200914174313-52bf62410745/go.mod h1:UT3vnXQcd48N6K0IuGGYk1ufh1lolzq+pC4aE2BPvWA=
k8s.io/api v0.0.0-20200921235740-d9d0f5541ae1/go.mod h1:5s62z0LxtR2JsRUbtXtTNHjcz/u4iXBuX/32bK2YFx8=
k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2/go.mod h1:Hma9QauilauA4Azq48kPjOcZNafcVy3yUE7iiJUT8QQ=
k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29/go.mod h1:Plj2rfLmeMYfAMuMgA/1EGuUaDxt78tvB9yfdi6fg6A=

View file

@ -233,7 +233,7 @@ autoload -U +X bashcompinit && bashcompinit
# use word boundary patterns for BSD or GNU sed
LWORD='[[:<:]]'
RWORD='[[:>:]]'
if sed --help 2>&1 | grep -q 'GNU\|BusyBox'; then
if sed --version 2>&1 | grep -q GNU; then
LWORD='\<'
RWORD='\>'
fi