github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unify alias of api errors under test

Browse Source
This commit is contained in:
danielqsj
2019-11-12 16:18:59 +08:00
parent 2914ba8e04
commit fc738cbb1d
32 changed files with 110 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/utils/density_utils.go
View File

@@ -22,7 +22,7 @@ import (
"time"
"k8s.io/api/core/v1"
apierrs "k8s.io/apimachinery/pkg/api/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
clientset "k8s.io/client-go/kubernetes"
@@ -44,7 +44,7 @@ func AddLabelsToNode(c clientset.Interface, nodeName string, labels map[string]s
for attempt := 0; attempt < retries; attempt++ {
_, err = c.CoreV1().Nodes().Patch(nodeName, types.MergePatchType, []byte(patch))
if err != nil {
if !apierrs.IsConflict(err) {
if !apierrors.IsConflict(err) {
return err
}
} else {
@@ -76,7 +76,7 @@ func RemoveLabelOffNode(c clientset.Interface, nodeName string, labelKeys []stri
}
_, err = c.CoreV1().Nodes().Update(node)
if err != nil {
if !apierrs.IsConflict(err) {
if !apierrors.IsConflict(err) {
return err
} else {
klog.V(2).Infof("Conflict when trying to remove a labels %v from %v", labelKeys, nodeName)