github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

fix import paths

Browse Source
This commit is contained in:
Haowei Cai 2020-07-21 10:47:14 -07:00
parent b71252a0ab
commit d7ff169552
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/.golint_failures
View File

@ -8,6 +8,7 @@ pkg/apis/abac/v1beta1
pkg/apis/admission pkg/apis/admission
pkg/apis/admissionregistration/v1 pkg/apis/admissionregistration/v1
pkg/apis/admissionregistration/v1beta1 pkg/apis/admissionregistration/v1beta1
pkg/apis/apiserverinternal
pkg/apis/apps/v1 pkg/apis/apps/v1
pkg/apis/apps/v1beta1 pkg/apis/apps/v1beta1
pkg/apis/apps/v1beta2 pkg/apis/apps/v1beta2
@ -204,6 +205,7 @@ staging/src/k8s.io/api/admission/v1
staging/src/k8s.io/api/admission/v1beta1 staging/src/k8s.io/api/admission/v1beta1
staging/src/k8s.io/api/admissionregistration/v1 staging/src/k8s.io/api/admissionregistration/v1
staging/src/k8s.io/api/admissionregistration/v1beta1 staging/src/k8s.io/api/admissionregistration/v1beta1
staging/src/k8s.io/api/apiserverinternal/v1alpha1
staging/src/k8s.io/api/apps/v1 staging/src/k8s.io/api/apps/v1
staging/src/k8s.io/api/apps/v1beta1 staging/src/k8s.io/api/apps/v1beta1
staging/src/k8s.io/api/apps/v1beta2 staging/src/k8s.io/api/apps/v1beta2
@ -302,8 +304,6 @@ staging/src/k8s.io/apiserver/pkg/apis/apiserver
staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1
staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1
staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1
staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal
staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1
staging/src/k8s.io/apiserver/pkg/apis/audit staging/src/k8s.io/apiserver/pkg/apis/audit
staging/src/k8s.io/apiserver/pkg/apis/audit/v1 staging/src/k8s.io/apiserver/pkg/apis/audit/v1
staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1 staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1

4
pkg/apis/apiserverinternal/install/install.go
View File

@ -21,8 +21,8 @@ package install
import ( import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/apis/apiserverinternal" "k8s.io/kubernetes/pkg/apis/apiserverinternal"
"k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1" "k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1"
) )
// Install registers the API group and adds types to a scheme // Install registers the API group and adds types to a scheme

2
pkg/apis/apiserverinternal/install/roundtrip_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"k8s.io/apimachinery/pkg/api/apitesting/roundtrip" "k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
"k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer" "k8s.io/kubernetes/pkg/apis/apiserverinternal/fuzzer"
) )
func TestRoundTrip(t *testing.T) { func TestRoundTrip(t *testing.T) {

2
pkg/apis/apiserverinternal/validation/validation.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation"
utilvalidation "k8s.io/apimachinery/pkg/util/validation" utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/apis/apiserverinternal" "k8s.io/kubernetes/pkg/apis/apiserverinternal"
) )
// ValidateStorageVersion validate the storage version object. // ValidateStorageVersion validate the storage version object.

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

@ -21,7 +21,7 @@ import (
"testing" "testing"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/apis/apiserverinternal" "k8s.io/kubernetes/pkg/apis/apiserverinternal"
) )
func TestValidateServerStorageVersion(t *testing.T) { func TestValidateServerStorageVersion(t *testing.T) {

2
staging/src/k8s.io/api/roundtrip_test.go
View File

@ -24,6 +24,7 @@ import (
admissionv1beta1 "k8s.io/api/admission/v1beta1" admissionv1beta1 "k8s.io/api/admission/v1beta1"
admissionregv1 "k8s.io/api/admissionregistration/v1" admissionregv1 "k8s.io/api/admissionregistration/v1"
admissionregv1beta1 "k8s.io/api/admissionregistration/v1beta1" admissionregv1beta1 "k8s.io/api/admissionregistration/v1beta1"
apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
appsv1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
@ -75,6 +76,7 @@ var groups = []runtime.SchemeBuilder{
admissionv1.SchemeBuilder, admissionv1.SchemeBuilder,
admissionregv1beta1.SchemeBuilder, admissionregv1beta1.SchemeBuilder,
admissionregv1.SchemeBuilder, admissionregv1.SchemeBuilder,
apiserverinternalv1alpha1.SchemeBuilder,
appsv1beta1.SchemeBuilder, appsv1beta1.SchemeBuilder,
appsv1beta2.SchemeBuilder, appsv1beta2.SchemeBuilder,
appsv1.SchemeBuilder, appsv1.SchemeBuilder,