github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

run ./root-rewrite-all-other-apis.sh, then run make all, pkg/... compiles

Browse Source
This commit is contained in:
Chao Xu
2017-06-22 11:04:37 -07:00
parent cd7e7afaaa
commit cde4772928
395 changed files with 536 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/daemon/daemoncontroller.go
View File

@@ -39,8 +39,8 @@ import (
"k8s.io/api/core/v1"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
apps "k8s.io/api/apps/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1"
appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1"

2
pkg/controller/daemon/daemoncontroller_test.go
View File

@@ -39,7 +39,7 @@ import (
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/api/core/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"
"k8s.io/kubernetes/pkg/controller"

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

@@ -32,8 +32,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
apps "k8s.io/api/apps/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/daemon/util"
labelsutil "k8s.io/kubernetes/pkg/util/labels"

2
pkg/controller/daemon/update_test.go
View File

@@ -21,7 +21,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
)
func TestDaemonSetUpdatesPods(t *testing.T) {

2
pkg/controller/daemon/util/daemonset_util.go
View File

@@ -24,7 +24,7 @@ import (
"k8s.io/api/core/v1"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
labelsutil "k8s.io/kubernetes/pkg/util/labels"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
)

2
pkg/controller/daemon/util/daemonset_util_test.go
View File

@@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
)
func newPod(podName string, nodeName string, label map[string]string) *v1.Pod {