github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107657 from astraw99/fix-label-msg

Browse Source 
Fix label msg when overwrite flag is set
This commit is contained in:
Kubernetes Prow Robot 2022-01-21 04:51:59 -08:00 committed by GitHub
commit e7e58de49f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/kubectl/pkg/cmd/label/label.go
View File

@ -307,7 +307,7 @@ func (o *LabelOptions) RunLabel() error {
if err != nil {
return err
}
dataChangeMsg = updateDataChangeMsg(oldData, newObj)
dataChangeMsg = updateDataChangeMsg(oldData, newObj, o.overwrite)
outputObj = info.Object
} else {
name, namespace := info.Name, info.Namespace
@ -334,7 +334,7 @@ func (o *LabelOptions) RunLabel() error {
if err != nil {
return err
}
dataChangeMsg = updateDataChangeMsg(oldData, newObj)
dataChangeMsg = updateDataChangeMsg(oldData, newObj, o.overwrite)
patchBytes, err := jsonpatch.CreateMergePatch(oldData, newObj)
createdPatch := err == nil
if err != nil {
@ -395,11 +395,11 @@ func (o *LabelOptions) RunLabel() error {
})
}
func updateDataChangeMsg(oldObj []byte, newObj []byte) string {
func updateDataChangeMsg(oldObj []byte, newObj []byte, overwrite bool) string {
msg := MsgNotLabeled
if !reflect.DeepEqual(oldObj, newObj) {
msg = MsgLabeled
if len(newObj) < len(oldObj) {
if !overwrite && len(newObj) < len(oldObj) {
msg = MsgUnLabeled
}
}

37
staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go
View File

@ -678,6 +678,41 @@ func TestLabelMsg(t *testing.T) {
},
expectMsg: MsgLabeled,
},
{
obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"status": "unhealthy"},
},
},
labels: map[string]string{"status": "healthy"},
overwrite: true,
expectObj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"status": "healthy",
},
},
},
expectMsg: MsgLabeled,
},
{
obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"status": "unhealthy"},
},
},
labels: map[string]string{"status": "healthy"},
overwrite: false,
expectObj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"status": "unhealthy",
},
},
},
expectMsg: MsgNotLabeled,
expectErr: true,
},
}
for _, test := range tests {
@ -700,7 +735,7 @@ func TestLabelMsg(t *testing.T) {
t.Errorf("unexpected error: %v %v", err, test)
}
dataChangeMsg := updateDataChangeMsg(oldData, newObj)
dataChangeMsg := updateDataChangeMsg(oldData, newObj, test.overwrite)
if dataChangeMsg != test.expectMsg {
t.Errorf("unexpected dataChangeMsg: %v != %v, %v", dataChangeMsg, test.expectMsg, test)
}