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

move pkg/api/v1/helpers.go to subpackage

Browse Source
This commit is contained in:
Chao Xu
2017-04-13 13:19:08 -07:00
parent 55042b0ba9
commit d4850b6c2b
87 changed files with 2901 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/controller_utils.go
View File

@@ -41,6 +41,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
"k8s.io/kubernetes/pkg/api/validation"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
@@ -877,7 +878,7 @@ func AddOrUpdateTaintOnNode(c clientset.Interface, nodeName string, taint *v1.Ta
if err != nil {
return err
}
newNode, ok, err := v1.AddOrUpdateTaint(oldNode, taint)
newNode, ok, err := v1helper.AddOrUpdateTaint(oldNode, taint)
if err != nil {
return fmt.Errorf("Failed to update taint annotation!")
}
@@ -921,7 +922,7 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint *v1.Taint,
if err != nil {
return err
}
newNode, ok, err := v1.RemoveTaint(oldNode, taint)
newNode, ok, err := v1helper.RemoveTaint(oldNode, taint)
if err != nil {
return fmt.Errorf("Failed to update taint annotation!")
}