github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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

7
pkg/controller/certificates/approver/sarapprove.go
View File

@@ -23,9 +23,10 @@ import (
"reflect"
"strings"
authorization "k8s.io/api/authorization/v1beta1"
capi "k8s.io/api/certificates/v1beta1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
authorization "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
k8s_certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1"
"k8s.io/kubernetes/pkg/controller/certificates"
@@ -85,7 +86,7 @@ func (a *sarApprover) handle(csr *capi.CertificateSigningRequest) error {
if approved, denied := certificates.GetCertApprovalCondition(&csr.Status); approved || denied {
return nil
}
x509cr, err := capi.ParseCSR(csr)
x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr)
if err != nil {
return fmt.Errorf("unable to parse csr %q: %v", csr.Name, err)
}

9
pkg/controller/certificates/approver/sarapprove_test.go
View File

@@ -27,11 +27,12 @@ import (
"net"
"testing"
authorization "k8s.io/api/authorization/v1beta1"
capi "k8s.io/api/certificates/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
testclient "k8s.io/client-go/testing"
authorization "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
k8s_certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
)
@@ -244,7 +245,7 @@ func TestSelfNodeServerCertRecognizer(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
csr := makeFancyTestCsr(tc.csrBuilder)
x509cr, err := capi.ParseCSR(csr)
x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr)
if err != nil {
t.Errorf("unexpected err: %v", err)
}
@@ -311,7 +312,7 @@ func testRecognizer(t *testing.T, cases []func(b *csrBuilder), recognizeFunc fun
c(&b)
t.Run(fmt.Sprintf("csr:%#v", b), func(t *testing.T) {
csr := makeFancyTestCsr(b)
x509cr, err := capi.ParseCSR(csr)
x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr)
if err != nil {
t.Errorf("unexpected err: %v", err)
}

2
pkg/controller/certificates/certificate_controller.go
View File

@@ -30,7 +30,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"
certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
certificates "k8s.io/api/certificates/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1"
certificateslisters "k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1"

2
pkg/controller/certificates/certificate_controller_test.go
View File

@@ -22,7 +22,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
certificates "k8s.io/api/certificates/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"

2
pkg/controller/certificates/certificate_controller_utils.go
View File

@@ -16,7 +16,7 @@ limitations under the License.
package certificates
import certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
import certificates "k8s.io/api/certificates/v1beta1"
// IsCertificateRequestApproved returns true if a certificate request has the
// "Approved" condition and no "Denied" conditions; false otherwise.

2
pkg/controller/certificates/signer/cfssl_signer.go
View File

@@ -25,7 +25,7 @@ import (
"os"
"time"
capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
capi "k8s.io/api/certificates/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1"
"k8s.io/kubernetes/pkg/controller/certificates"

2
pkg/controller/certificates/signer/cfssl_signer_test.go
View File

@@ -24,7 +24,7 @@ import (
"time"
"k8s.io/client-go/util/cert"
capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
capi "k8s.io/api/certificates/v1beta1"
)
func TestSigner(t *testing.T) {

2
pkg/controller/client_builder.go
View File

@@ -31,7 +31,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
v1authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1"
v1authenticationapi "k8s.io/api/authentication/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
v1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1"
v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"

4
pkg/controller/controller_ref_manager.go
View File

@@ -27,8 +27,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/api/core/v1"
appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
appsv1beta1 "k8s.io/api/apps/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
)
// GetControllerOf returns the controllerRef if controllee has a controller,

2
pkg/controller/controller_utils.go
View File

@@ -45,7 +45,7 @@ import (
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/api/v1/ref"
"k8s.io/kubernetes/pkg/api/validation"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
clientretry "k8s.io/kubernetes/pkg/client/retry"
hashutil "k8s.io/kubernetes/pkg/util/hash"

2
pkg/controller/controller_utils_test.go
View File

@@ -41,7 +41,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"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"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/securitycontext"
)

4
pkg/controller/cronjob/cronjob_controller.go
View File

@@ -48,8 +48,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/api/v1/ref"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
batchv1 "k8s.io/api/batch/v1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/util/metrics"
)

4
pkg/controller/cronjob/cronjob_controller_test.go
View File

@@ -27,8 +27,8 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
"k8s.io/api/core/v1"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
batchv1 "k8s.io/api/batch/v1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/kubernetes/pkg/controller"
)

4
pkg/controller/cronjob/injection.go
View File

@@ -25,8 +25,8 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
"k8s.io/api/core/v1"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
batchv1 "k8s.io/api/batch/v1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
)

4
pkg/controller/cronjob/utils.go
View File

@@ -32,8 +32,8 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/api/v1/ref"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
batchv1 "k8s.io/api/batch/v1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/kubernetes/pkg/controller"
)

4
pkg/controller/cronjob/utils_test.go
View File

@@ -26,8 +26,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/api/core/v1"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
batchv1 "k8s.io/api/batch/v1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/kubernetes/pkg/controller"
)

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 {

2
pkg/controller/deployment/deployment_controller.go
View File

@@ -40,7 +40,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"
extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1"

2
pkg/controller/deployment/deployment_controller_test.go
View File

@@ -29,7 +29,7 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
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"

2
pkg/controller/deployment/progress.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller/deployment/util"
)

2
pkg/controller/deployment/progress_test.go
View File

@@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/util/workqueue"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller/deployment/util"
)

2
pkg/controller/deployment/recreate.go
View File

@@ -19,7 +19,7 @@ package deployment
import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/deployment/util"
)

2
pkg/controller/deployment/recreate_test.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
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"

2
pkg/controller/deployment/rollback.go
View File

@@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
)

2
pkg/controller/deployment/rolling.go
View File

@@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/util/integer"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller"
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
)

2
pkg/controller/deployment/rolling_test.go
View File

@@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/record"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
)

2
pkg/controller/deployment/sync.go
View File

@@ -29,7 +29,7 @@ import (
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/controller"
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
labelsutil "k8s.io/kubernetes/pkg/util/labels"

2
pkg/controller/deployment/sync_test.go
View File

@@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
testclient "k8s.io/client-go/testing"
"k8s.io/client-go/tools/record"
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"

2
pkg/controller/deployment/util/deployment_util.go
View File

@@ -37,7 +37,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
internalextensions "k8s.io/kubernetes/pkg/apis/extensions"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"

2
pkg/controller/deployment/util/deployment_util_test.go
View File

@@ -34,7 +34,7 @@ import (
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
"k8s.io/kubernetes/pkg/controller"
)

2
pkg/controller/deployment/util/replicaset_util.go
View File

@@ -24,7 +24,7 @@ import (
errorsutil "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1"
extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/retry"

6
pkg/controller/disruption/disruption.go
View File

@@ -35,9 +35,9 @@ 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"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/api/extensions/v1beta1"
policy "k8s.io/api/policy/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
policyclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1"
appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1"

6
pkg/controller/disruption/disruption_test.go
View File

@@ -30,9 +30,9 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
apps "k8s.io/api/apps/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
policy "k8s.io/api/policy/v1beta1"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"
"k8s.io/kubernetes/pkg/controller"

2
pkg/controller/history/controller_history.go
View File

@@ -23,7 +23,7 @@ import (
"sort"
"strconv"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1"
appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1"

2
pkg/controller/history/controller_history_test.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/api/core/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/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"

2
pkg/controller/job/jobcontroller.go
View File

@@ -35,7 +35,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
batch "k8s.io/kubernetes/pkg/apis/batch/v1"
batch "k8s.io/api/batch/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
batchinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/batch/v1"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"

2
pkg/controller/job/jobcontroller_test.go
View File

@@ -33,7 +33,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
batch "k8s.io/kubernetes/pkg/apis/batch/v1"
batch "k8s.io/api/batch/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"

2
pkg/controller/job/utils.go
View File

@@ -19,7 +19,7 @@ package job
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/api/core/v1"
batch "k8s.io/kubernetes/pkg/apis/batch/v1"
batch "k8s.io/api/batch/v1"
)
func IsJobFinished(j *batch.Job) bool {

2
pkg/controller/job/utils_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"k8s.io/api/core/v1"
batch "k8s.io/kubernetes/pkg/apis/batch/v1"
batch "k8s.io/api/batch/v1"
)
func TestIsJobFinished(t *testing.T) {

2
pkg/controller/node/nodecontroller_test.go
View File

@@ -31,7 +31,7 @@ import (
testcore "k8s.io/client-go/testing"
"k8s.io/api/core/v1"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"

6
pkg/controller/podautoscaler/horizontal.go
View File

@@ -38,9 +38,9 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
extensions "k8s.io/api/extensions/v1beta1"
autoscalingclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1"
extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1"
autoscalinginformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/autoscaling/v1"

6
pkg/controller/podautoscaler/horizontal_test.go
View File

@@ -35,9 +35,9 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/autoscaling"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
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"

6
pkg/controller/podautoscaler/legacy_horizontal_test.go
View File

@@ -36,9 +36,9 @@ import (
restclient "k8s.io/client-go/rest"
core "k8s.io/client-go/testing"
"k8s.io/api/core/v1"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
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"

2
pkg/controller/podautoscaler/metrics/interfaces.go
View File

@@ -21,7 +21,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/api/core/v1"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
)
// PodMetricsInfo contains pod metric values as a map from pod names to

2
pkg/controller/podautoscaler/metrics/legacy_metrics_client.go
View File

@@ -30,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
clientgov1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/api/core/v1"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
)

2
pkg/controller/podautoscaler/metrics/rest_metrics_client.go
View File

@@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
clientv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/api/core/v1"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
customapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1"
resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1"
customclient "k8s.io/metrics/pkg/client/custom_metrics"

2
pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go
View File

@@ -30,7 +30,7 @@ import (
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
kv1 "k8s.io/api/core/v1"
autoscalingapi "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
autoscalingapi "k8s.io/api/autoscaling/v2alpha1"
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"
cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake"

2
pkg/controller/podautoscaler/replica_calculator.go
View File

@@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/api/core/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
v1coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"
metricsclient "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
)

2
pkg/controller/podautoscaler/replica_calculator_test.go
View File

@@ -30,7 +30,7 @@ import (
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"

4
pkg/controller/replicaset/replica_set.go
View File

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

2
pkg/controller/replicaset/replica_set_test.go
View File

@@ -44,7 +44,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"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"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

2
pkg/controller/replicaset/replica_set_utils.go
View File

@@ -28,7 +28,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"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"
unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1"
)

2
pkg/controller/statefulset/stateful_pod_control.go
View File

@@ -26,7 +26,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record"
"k8s.io/api/core/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"

2
pkg/controller/statefulset/stateful_set.go
View File

@@ -33,7 +33,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"

2
pkg/controller/statefulset/stateful_set_control.go
View File

@@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/api/core/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/controller/history"
"github.com/golang/glog"

2
pkg/controller/statefulset/stateful_set_control_test.go
View File

@@ -35,7 +35,7 @@ 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"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"

2
pkg/controller/statefulset/stateful_set_status_updater.go
View File

@@ -22,7 +22,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/kubernetes/scheme"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1"

2
pkg/controller/statefulset/stateful_set_status_updater_test.go
View File

@@ -26,7 +26,7 @@ import (
core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1"
)

2
pkg/controller/statefulset/stateful_set_test.go
View File

@@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/cache"
"k8s.io/api/core/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/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"

2
pkg/controller/statefulset/stateful_set_utils.go
View File

@@ -25,7 +25,7 @@ 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"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/history"

2
pkg/controller/statefulset/stateful_set_utils_test.go
View File

@@ -30,7 +30,7 @@ import (
"k8s.io/api/core/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
apps "k8s.io/api/apps/v1beta1"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/history"
)

2
pkg/controller/volume/persistentvolume/binder_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"k8s.io/api/core/v1"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
)
// Test single call to syncClaim and syncVolume methods.

2
pkg/controller/volume/persistentvolume/delete_test.go
View File

@@ -21,7 +21,7 @@ import (
"testing"
"k8s.io/api/core/v1"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
)
// Test single call to syncVolume, expecting recycling to happen.

2
pkg/controller/volume/persistentvolume/framework_test.go
View File

@@ -42,7 +42,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/api/core/v1"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions"

2
pkg/controller/volume/persistentvolume/provision_test.go
View File

@@ -22,7 +22,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/api/core/v1"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
)
var class1Parameters = map[string]string{

2
pkg/controller/volume/persistentvolume/pv_controller.go
View File

@@ -30,7 +30,7 @@ import (
"k8s.io/api/core/v1"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
"k8s.io/kubernetes/pkg/api/v1/ref"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1"

2
pkg/controller/volume/persistentvolume/pv_controller_base.go
View File

@@ -34,7 +34,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
"k8s.io/api/core/v1"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1"
storageinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1"

2
pkg/controller/volume/persistentvolume/recycle_test.go
View File

@@ -21,7 +21,7 @@ import (
"testing"
"k8s.io/api/core/v1"
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
storage "k8s.io/api/storage/v1"
)
// Test single call to syncVolume, expecting recycling to happen.