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

Migrate api.Scheme to scheme.Scheme

Browse Source
This commit is contained in:
Jacob Simpson
2017-07-10 10:54:48 -07:00
parent 2c70e5df35
commit a765b8cfca
53 changed files with 128 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/daemon/update.go
View File

@@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
intstrutil "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/kubernetes/pkg/api"
"k8s.io/client-go/kubernetes/scheme"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/daemon/util"
@@ -94,7 +94,7 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur
// We use history name instead of computing hash, so that we don't need to worry about hash collision
if _, ok := history.Labels[extensions.DefaultDaemonSetUniqueLabelKey]; !ok {
var clone interface{}
clone, err = api.Scheme.DeepCopy(history)
clone, err = scheme.Scheme.DeepCopy(history)
if err != nil {
return nil, nil, err
}
@@ -134,7 +134,7 @@ func (dsc *DaemonSetsController) constructHistory(ds *extensions.DaemonSet) (cur
// Update revision number if necessary
if cur.Revision < currRevision {
var clone interface{}
clone, err = api.Scheme.DeepCopy(cur)
clone, err = scheme.Scheme.DeepCopy(cur)
if err != nil {
return nil, nil, err
}
@@ -233,7 +233,7 @@ func (dsc *DaemonSetsController) dedupCurHistories(ds *extensions.DaemonSet, cur
}
for _, pod := range pods {
if pod.Labels[extensions.DefaultDaemonSetUniqueLabelKey] != keepCur.Labels[extensions.DefaultDaemonSetUniqueLabelKey] {
clone, err := api.Scheme.DeepCopy(pod)
clone, err := scheme.Scheme.DeepCopy(pod)
if err != nil {
return nil, err
}