Skip to content

Commit 2c70e5d

Browse files
jcbsmpsnjcbsmpsn
committed
Manual changes.
1 parent 29c1b81 commit 2c70e5d

File tree

20 files changed

+35
-2
lines changed

20 files changed

+35
-2
lines changed

‎pkg/controller/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ go_library(
2020
tags = ["automanaged"],
2121
deps = [
2222
"//pkg/api:go_default_library",
23+
"//pkg/api/install:go_default_library",
2324
"//pkg/api/v1/helper:go_default_library",
2425
"//pkg/api/v1/pod:go_default_library",
2526
"//pkg/api/v1/ref:go_default_library",

‎pkg/controller/controller_utils.go

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
"k8s.io/client-go/tools/record"
4444
"k8s.io/client-go/util/integer"
4545
"k8s.io/kubernetes/pkg/api"
46+
_ "k8s.io/kubernetes/pkg/api/install"
4647
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
4748
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
4849
"k8s.io/kubernetes/pkg/api/v1/ref"

‎pkg/controller/cronjob/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ go_test(
5151
library = ":go_default_library",
5252
tags = ["automanaged"],
5353
deps = [
54+
"//pkg/api/install:go_default_library",
55+
"//pkg/apis/batch/install:go_default_library",
5456
"//pkg/controller:go_default_library",
5557
"//vendor/k8s.io/api/batch/v1:go_default_library",
5658
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library",

‎pkg/controller/cronjob/cronjob_controller_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ import (
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/types"
3131
"k8s.io/client-go/tools/record"
32+
// For the cronjob controller to do conversions.
33+
_ "k8s.io/kubernetes/pkg/api/install"
34+
_ "k8s.io/kubernetes/pkg/apis/batch/install"
3235
"k8s.io/kubernetes/pkg/controller"
3336
)
3437

‎pkg/controller/daemon/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ go_library(
4747
"//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
4848
"//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library",
4949
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
50+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
5051
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
5152
"//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library",
5253
"//vendor/k8s.io/client-go/listers/apps/v1beta1:go_default_library",

‎pkg/controller/daemon/daemoncontroller.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
coreinformers "k8s.io/client-go/informers/core/v1"
3939
extensionsinformers "k8s.io/client-go/informers/extensions/v1beta1"
4040
clientset "k8s.io/client-go/kubernetes"
41+
"k8s.io/client-go/kubernetes/scheme"
4142
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
4243
unversionedextensions "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
4344
appslisters "k8s.io/client-go/listers/apps/v1beta1"
@@ -864,7 +865,7 @@ func storeDaemonSetStatus(dsClient unversionedextensions.DaemonSetInterface, ds
864865
return nil
865866
}
866867

867-
clone, err := api.Scheme.DeepCopy(ds)
868+
clone, err := scheme.Scheme.DeepCopy(ds)
868869
if err != nil {
869870
return err
870871
}

‎pkg/controller/podautoscaler/metrics/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ go_test(
4444
tags = ["automanaged"],
4545
deps = [
4646
"//pkg/api:go_default_library",
47+
"//pkg/apis/extensions/install:go_default_library",
4748
"//vendor/github.com/stretchr/testify/assert:go_default_library",
4849
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
4950
"//vendor/k8s.io/api/core/v1:go_default_library",

‎pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import (
3131
"k8s.io/apimachinery/pkg/runtime/schema"
3232
core "k8s.io/client-go/testing"
3333
"k8s.io/kubernetes/pkg/api"
34+
// For api.Registry.RESTMapper()
35+
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
3436
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"
3537
cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake"
3638

‎pkg/controller/replicaset/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ go_library(
3232
"//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
3333
"//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library",
3434
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
35+
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
3536
"//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
3637
"//vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1:go_default_library",
3738
"//vendor/k8s.io/client-go/listers/core/v1:go_default_library",

‎pkg/controller/replicaset/replica_set.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
coreinformers "k8s.io/client-go/informers/core/v1"
3939
extensionsinformers "k8s.io/client-go/informers/extensions/v1beta1"
4040
clientset "k8s.io/client-go/kubernetes"
41+
"k8s.io/client-go/kubernetes/scheme"
4142
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
4243
corelisters "k8s.io/client-go/listers/core/v1"
4344
extensionslisters "k8s.io/client-go/listers/extensions/v1beta1"
@@ -597,7 +598,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(key string) error {
597598
manageReplicasErr = rsc.manageReplicas(filteredPods, rs)
598599
}
599600

600-
copy, err := api.Scheme.DeepCopy(rs)
601+
copy, err := scheme.Scheme.DeepCopy(rs)
601602
if err != nil {
602603
return err
603604
}

‎pkg/kubelet/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ go_test(
167167
tags = ["automanaged"],
168168
deps = [
169169
"//pkg/api:go_default_library",
170+
"//pkg/api/install:go_default_library",
170171
"//pkg/apis/componentconfig:go_default_library",
171172
"//pkg/capabilities:go_default_library",
172173
"//pkg/kubelet/cadvisor/testing:go_default_library",

‎pkg/kubelet/config/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ go_library(
2424
deps = [
2525
"//pkg/api:go_default_library",
2626
"//pkg/api/helper:go_default_library",
27+
"//pkg/api/install:go_default_library",
2728
"//pkg/api/v1:go_default_library",
2829
"//pkg/api/v1/pod:go_default_library",
2930
"//pkg/api/validation:go_default_library",

‎pkg/kubelet/config/common.go

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ import (
2929
utilyaml "k8s.io/apimachinery/pkg/util/yaml"
3030
"k8s.io/kubernetes/pkg/api"
3131
"k8s.io/kubernetes/pkg/api/helper"
32+
// TODO: remove this import if
33+
// api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() is changed
34+
// to "v1"?
35+
_ "k8s.io/kubernetes/pkg/api/install"
3236
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
3337
"k8s.io/kubernetes/pkg/api/validation"
3438
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"

‎pkg/kubelet/container/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ go_test(
6161
tags = ["automanaged"],
6262
deps = [
6363
"//pkg/api:go_default_library",
64+
"//pkg/api/install:go_default_library",
6465
"//vendor/github.com/stretchr/testify/assert:go_default_library",
6566
"//vendor/k8s.io/api/core/v1:go_default_library",
6667
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎pkg/kubelet/container/ref_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"k8s.io/api/core/v1"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/kubernetes/pkg/api"
25+
_ "k8s.io/kubernetes/pkg/api/install"
2526
)
2627

2728
func TestFieldPath(t *testing.T) {

‎pkg/kubelet/kubelet_pods_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ import (
3535
core "k8s.io/client-go/testing"
3636
"k8s.io/client-go/tools/record"
3737
"k8s.io/kubernetes/pkg/api"
38+
// TODO: remove this import if
39+
// api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String() is changed
40+
// to "v1"?
41+
_ "k8s.io/kubernetes/pkg/api/install"
3842
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
3943
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
4044
"k8s.io/kubernetes/pkg/kubelet/server/portforward"

‎pkg/kubelet/server/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ go_test(
6262
tags = ["automanaged"],
6363
deps = [
6464
"//pkg/api:go_default_library",
65+
"//pkg/api/install:go_default_library",
6566
"//pkg/kubelet/cm:go_default_library",
6667
"//pkg/kubelet/container:go_default_library",
6768
"//pkg/kubelet/container/testing:go_default_library",

‎pkg/kubelet/server/server_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ import (
5050
"k8s.io/client-go/tools/remotecommand"
5151
utiltesting "k8s.io/client-go/util/testing"
5252
"k8s.io/kubernetes/pkg/api"
53+
// Do some initialization to decode the query parameters correctly.
54+
_ "k8s.io/kubernetes/pkg/api/install"
5355
"k8s.io/kubernetes/pkg/kubelet/cm"
5456
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
5557
kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing"

‎pkg/volume/util/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ go_test(
4646
library = ":go_default_library",
4747
tags = ["automanaged"],
4848
deps = [
49+
"//pkg/api/install:go_default_library",
4950
"//pkg/api/v1/helper:go_default_library",
5051
"//vendor/k8s.io/api/core/v1:go_default_library",
5152
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎pkg/volume/util/util_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ import (
2323

2424
"k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26+
// util.go uses api.Codecs.LegacyCodec so import this package to do some
27+
// resource initialization.
28+
_ "k8s.io/kubernetes/pkg/api/install"
2629
"k8s.io/kubernetes/pkg/api/v1/helper"
2730
)
2831

0 commit comments

Comments
 (0)