Merge pull request #95202 from rikatz/remove-master-clusterinfo

Change kubectl clusterinfo to non offensive words

Kubernetes-commit: bf9354d8cc8ec7582c296c104563ca99d4a41b00
This commit is contained in:
Kubernetes Publisher 2020-10-02 14:19:04 -07:00
parent aef03d78a9
commit c1df07341a
3 changed files with 7 additions and 7 deletions

4
Godeps/Godeps.json generated
View File

@ -772,11 +772,11 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f8c0b224ad5a"
"Rev": "a0a9b7d9d5e2"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "4116974d9b44"
"Rev": "291e6a8dc8ad"
},
{
"ImportPath": "k8s.io/component-base",

6
go.mod
View File

@ -37,7 +37,7 @@ require (
k8s.io/api v0.0.0-20200922195808-5bb35d2636ca
k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0
k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2
k8s.io/client-go v0.0.0-20200924040014-f8c0b224ad5a
k8s.io/client-go v0.0.0-20200926000026-a0a9b7d9d5e2
k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
@ -51,8 +51,8 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20200922195808-5bb35d2636ca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2
k8s.io/client-go => k8s.io/client-go v0.0.0-20200924040014-f8c0b224ad5a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200904030940-4116974d9b44
k8s.io/client-go => k8s.io/client-go v0.0.0-20200926000026-a0a9b7d9d5e2
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201001115509-291e6a8dc8ad
k8s.io/component-base => k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
k8s.io/metrics => k8s.io/metrics v0.0.0-20200909174239-935813ae0d59
)

4
go.sum
View File

@ -506,8 +506,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
k8s.io/api v0.0.0-20200922195808-5bb35d2636ca/go.mod h1:FAsg3Y/xcbFIbnyfpgARCQ8di7NxpIRZWbawQTkHTDo=
k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2/go.mod h1:Hma9QauilauA4Azq48kPjOcZNafcVy3yUE7iiJUT8QQ=
k8s.io/client-go v0.0.0-20200924040014-f8c0b224ad5a/go.mod h1:0TFqP6nDzw4kbUbyCXc0xcULYS2MvbAQIAaEhgnPPAA=
k8s.io/code-generator v0.0.0-20200904030940-4116974d9b44/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/client-go v0.0.0-20200926000026-a0a9b7d9d5e2/go.mod h1:0TFqP6nDzw4kbUbyCXc0xcULYS2MvbAQIAaEhgnPPAA=
k8s.io/code-generator v0.0.0-20201001115509-291e6a8dc8ad/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f/go.mod h1:KLUf6+rBAAlh4P5aX9t725mVdFgvY6LfYzl+QOveAV4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=