upstream/kubectl
1
0
Fork 0
mirror of https://github.com/kubernetes/kubectl.git synced 2026-05-28 04:35:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #104011 from manugupt1/master

Browse source 
fix: 81134: display conflicted taint without a json representation

Kubernetes-commit: 94a55684a8ef2f0108b1f9f8bd15b3e31ac92c4d
This commit is contained in:
Kubernetes Publisher 2021-08-05 08:18:11 -07:00
commit 0d2412020e
4 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
go.mod
View file

@ -31,11 +31,11 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210720141931-aa30bdaf750c
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/api v0.0.0-20210805120319-7a35d40d43ac
k8s.io/apimachinery v0.0.0-20210805051055-f7769293e6f1
k8s.io/cli-runtime v0.0.0-20210730024628-6149e6a4cfd2
k8s.io/client-go v0.0.0-20210805040553-3c86d4a9204c
k8s.io/component-base v0.0.0-20210730023241-ad5ac9575950
k8s.io/client-go v0.0.0-20210805080552-fa98c048508e
k8s.io/component-base v0.0.0-20210805120716-92bebfd2c985
k8s.io/component-helpers v0.0.0-20210730023343-748d9b69b67b
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
@ -47,12 +47,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210720141931-aa30bdaf750c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13
k8s.io/api => k8s.io/api v0.0.0-20210805120319-7a35d40d43ac
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210805051055-f7769293e6f1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210730024628-6149e6a4cfd2
k8s.io/client-go => k8s.io/client-go v0.0.0-20210805040553-3c86d4a9204c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210729231338-96aa56dd4857
k8s.io/component-base => k8s.io/component-base v0.0.0-20210730023241-ad5ac9575950
k8s.io/client-go => k8s.io/client-go v0.0.0-20210805080552-fa98c048508e
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210805155932-09c829015078
k8s.io/component-base => k8s.io/component-base v0.0.0-20210805120716-92bebfd2c985
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210730023343-748d9b69b67b
k8s.io/metrics => k8s.io/metrics v0.0.0-20210730024519-ae7ef8fabb7f
)

18
go.sum
View file

@ -737,17 +737,17 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210720141931-aa30bdaf750c h1:bQDI22QyjupmAGqhbVE2uIkAkAAVEVfTf/n8RG/Xtpo=
k8s.io/api v0.0.0-20210720141931-aa30bdaf750c/go.mod h1:FtqZiusVhnyM5jUPPFkDCU91OKo0sOpX9b9hotVGbIk=
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13 h1:Y40e5ho6n8KOvBCqdz/jm7ssKQyQLQdbZbC3lR9TaCU=
k8s.io/apimachinery v0.0.0-20210712060818-a644435e2c13/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/api v0.0.0-20210805120319-7a35d40d43ac h1:Wu1nE5Lz+WstOMn+yT1unlEh/w2eXTQ+cWeD8m/YQYE=
k8s.io/api v0.0.0-20210805120319-7a35d40d43ac/go.mod h1:9J6nkHavSazyXmPeuA4f1YO9Ztdjw7nDibPjT4P+wsY=
k8s.io/apimachinery v0.0.0-20210805051055-f7769293e6f1 h1:cVpwhaGeh/tNPBeYbFff3tjx5AxwG5zwImhz+eusG3k=
k8s.io/apimachinery v0.0.0-20210805051055-f7769293e6f1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/cli-runtime v0.0.0-20210730024628-6149e6a4cfd2 h1:QALxbHPQ2sJBgghE+LGMtnt2tcNsMCmwXEDAbkHeE9o=
k8s.io/cli-runtime v0.0.0-20210730024628-6149e6a4cfd2/go.mod h1:LN2ZcbXYsFL0imoBy/LfNOLA6m6N7jXV5V/09Azb848=
k8s.io/client-go v0.0.0-20210805040553-3c86d4a9204c h1:rlOc3ZYYC/aeKMSHlrWNbUrc+i2iXKlqZe5XcEvmSo8=
k8s.io/client-go v0.0.0-20210805040553-3c86d4a9204c/go.mod h1:giP+QzPQ7YrInF4wp+jzA8oSh6o+9Nb+r2XCIzGIfo4=
k8s.io/code-generator v0.0.0-20210729231338-96aa56dd4857/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/component-base v0.0.0-20210730023241-ad5ac9575950 h1:pdupX8U+ovaOPgbMpjYIbKsir253L0kxnGObXTd+ZwA=
k8s.io/component-base v0.0.0-20210730023241-ad5ac9575950/go.mod h1:l7uRPvt9vBUPHa3RbKW7tWjhX6cVMTThTNOv48GNY+U=
k8s.io/client-go v0.0.0-20210805080552-fa98c048508e h1:0RaerCWCkguHMpXmdiPlW+wLFkV2oojh4F/QwThEqtI=
k8s.io/client-go v0.0.0-20210805080552-fa98c048508e/go.mod h1:MtYi0MQWcNfpAaLnshaWryCo9Le+5QnBH4dmBTOAQNc=
k8s.io/code-generator v0.0.0-20210805155932-09c829015078/go.mod h1:0GzsSvi+8G9ZHYJnyo9pr8ojPIOFcJwEEfNLudDw5LQ=
k8s.io/component-base v0.0.0-20210805120716-92bebfd2c985 h1:5AICcEUyTnjI3rCqtY3n7sjZRLrCtI8Ejt9jnY+24kQ=
k8s.io/component-base v0.0.0-20210805120716-92bebfd2c985/go.mod h1:uuSJv3vcTE8Ays2CdTgQdaDyg2nYrkK3jVrLDSV3uAo=
k8s.io/component-helpers v0.0.0-20210730023343-748d9b69b67b h1:vssLWGUWjxFjoyo2pmNJXgGqYnnBkmbzMRO883F3eHE=
k8s.io/component-helpers v0.0.0-20210730023343-748d9b69b67b/go.mod h1:ln2gFAE6woRdvvp3DFORCBgy2XUo0iVBWEgf0iX3Sc4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

2
pkg/cmd/taint/taint.go
View file

@ -248,7 +248,7 @@ func (o TaintOptions) Validate() error {
continue
}
if len(taintRemove.Effect) == 0 || taintAdd.Effect == taintRemove.Effect {
conflictTaint := fmt.Sprintf("{\"%s\":\"%s\"}", taintRemove.Key, taintRemove.Effect)
conflictTaint := fmt.Sprintf("%s=%s", taintRemove.Key, taintRemove.Effect)
conflictTaints = append(conflictTaints, conflictTaint)
}
}

6
pkg/cmd/taint/taint_test.go
View file

@ -216,6 +216,12 @@ func TestTaint(t *testing.T) {
expectFatal: true,
expectTaint: false,
},
{
description: "add and remove taint with same key and effect should be rejected",
args: []string{"node", "node-name", "foo=:NoExcute", "foo=:NoExcute-"},
expectFatal: true,
expectTaint: false,
},
{
description: "can't update existing taint on the node, since 'overwrite' flag is not set",
oldTaints: []corev1.Taint{{