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

pkg/apis/core: mechanical import fixes in dependencies

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-11-08 23:34:54 +01:00
parent d13b936a2a
commit 012b085ac8
691 changed files with 835 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/batch/types.go
View File

@@ -18,7 +18,7 @@ package batch
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api"
api "k8s.io/kubernetes/pkg/apis/core"
)
// +genclient

2
pkg/apis/batch/v1/conversion.go
View File

@@ -23,8 +23,8 @@ import (
"k8s.io/apimachinery/pkg/conversion"
"k8s.io/apimachinery/pkg/runtime"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/batch"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
)
func addConversionFuncs(scheme *runtime.Scheme) error {

2
pkg/apis/batch/v1/defaults_test.go
View File

@@ -25,10 +25,10 @@ import (
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/legacyscheme"
_ "k8s.io/kubernetes/pkg/apis/batch/install"
. "k8s.io/kubernetes/pkg/apis/batch/v1"
_ "k8s.io/kubernetes/pkg/apis/core/install"
)
func TestSetDefaultJob(t *testing.T) {

4
pkg/apis/batch/v1/zz_generated.conversion.go generated
View File

@@ -26,9 +26,9 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
batch "k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
unsafe "unsafe"
)

2
pkg/apis/batch/v1/zz_generated.defaults.go generated
View File

@@ -23,7 +23,7 @@ package v1
import (
v1 "k8s.io/api/batch/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
)
// RegisterDefaults adds defaulters functions to the given scheme.

2
pkg/apis/batch/v1beta1/defaults_test.go
View File

@@ -23,10 +23,10 @@ import (
batchv1beta1 "k8s.io/api/batch/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/legacyscheme"
_ "k8s.io/kubernetes/pkg/apis/batch/install"
. "k8s.io/kubernetes/pkg/apis/batch/v1beta1"
_ "k8s.io/kubernetes/pkg/apis/core/install"
)
func TestSetDefaultCronJob(t *testing.T) {

2
pkg/apis/batch/v1beta1/zz_generated.conversion.go generated
View File

@@ -26,9 +26,9 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
batch "k8s.io/kubernetes/pkg/apis/batch"
batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
api "k8s.io/kubernetes/pkg/apis/core"
unsafe "unsafe"
)

2
pkg/apis/batch/v1beta1/zz_generated.defaults.go generated
View File

@@ -23,7 +23,7 @@ package v1beta1
import (
v1beta1 "k8s.io/api/batch/v1beta1"
runtime "k8s.io/apimachinery/pkg/runtime"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/kubernetes/pkg/apis/core/v1"
)
// RegisterDefaults adds defaulters functions to the given scheme.

2
pkg/apis/batch/v2alpha1/defaults_test.go
View File

@@ -23,10 +23,10 @@ import (
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/apimachinery/pkg/runtime"
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/legacyscheme"
_ "k8s.io/kubernetes/pkg/apis/batch/install"
. "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
_ "k8s.io/kubernetes/pkg/apis/core/install"
)
func TestSetDefaultCronJob(t *testing.T) {

2
pkg/apis/batch/v2alpha1/zz_generated.conversion.go generated
View File

@@ -26,9 +26,9 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
batch "k8s.io/kubernetes/pkg/apis/batch"
batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1"
api "k8s.io/kubernetes/pkg/apis/core"
unsafe "unsafe"
)

2
pkg/apis/batch/v2alpha1/zz_generated.defaults.go generated
View File

@@ -23,7 +23,7 @@ package v2alpha1
import (
v2alpha1 "k8s.io/api/batch/v2alpha1"
runtime "k8s.io/apimachinery/pkg/runtime"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/kubernetes/pkg/apis/core/v1"
)
// RegisterDefaults adds defaulters functions to the given scheme.

4
pkg/apis/batch/validation/validation.go
View File

@@ -24,9 +24,9 @@ import (
"k8s.io/apimachinery/pkg/labels"
apimachineryvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/api"
apivalidation "k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
apivalidation "k8s.io/kubernetes/pkg/apis/core/validation"
)
// TODO: generalize for other controller objects that will follow the same pattern, such as ReplicaSet and DaemonSet, and

2
pkg/apis/batch/validation/validation_test.go
View File

@@ -22,8 +22,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/batch"
api "k8s.io/kubernetes/pkg/apis/core"
)
func getValidManualSelector() *metav1.LabelSelector {

2
pkg/apis/batch/zz_generated.deepcopy.go generated
View File

@@ -24,7 +24,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
api "k8s.io/kubernetes/pkg/apis/core"
reflect "reflect"
)