Skip to content

Commit 2d914ee

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#53984 from sttts/sttts-legacyscheme
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. pkg/api: extract Scheme/Registry/Codecs into pkg/api/legacyscheme This serves as - a preparation for the pkg/api->pkg/apis/core move - and makes the dependency to the scheme explicit when vizualizing left depenncies. The later helps with our our efforts to split up the monolithic repo into self-contained sub-repos, e.g. for kubectl, controller-manager and kube-apiserver in the future.
2 parents 3a44e8e + cad0364 commit 2d914ee

File tree

500 files changed

+1590
-1308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

500 files changed

+1590
-1308
lines changed

‎cmd/cloud-controller-manager/app/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ go_library(
1111
importpath = "k8s.io/kubernetes/cmd/cloud-controller-manager/app",
1212
deps = [
1313
"//cmd/cloud-controller-manager/app/options:go_default_library",
14-
"//pkg/api:go_default_library",
14+
"//pkg/api/legacyscheme:go_default_library",
1515
"//pkg/cloudprovider:go_default_library",
1616
"//pkg/controller:go_default_library",
1717
"//pkg/controller/cloud:go_default_library",

‎cmd/cloud-controller-manager/app/controllermanager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"k8s.io/client-go/tools/leaderelection/resourcelock"
4242
"k8s.io/client-go/tools/record"
4343
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
44-
"k8s.io/kubernetes/pkg/api"
44+
"k8s.io/kubernetes/pkg/api/legacyscheme"
4545
"k8s.io/kubernetes/pkg/cloudprovider"
4646
"k8s.io/kubernetes/pkg/controller"
4747
cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud"
@@ -283,5 +283,5 @@ func createRecorder(kubeClient *clientset.Clientset) record.EventRecorder {
283283
eventBroadcaster := record.NewBroadcaster()
284284
eventBroadcaster.StartLogging(glog.Infof)
285285
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events("")})
286-
return eventBroadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: "cloud-controller-manager"})
286+
return eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"})
287287
}

‎cmd/gke-certificates-controller/app/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ go_library(
1515
],
1616
importpath = "k8s.io/kubernetes/cmd/gke-certificates-controller/app",
1717
deps = [
18-
"//pkg/api:go_default_library",
18+
"//pkg/api/legacyscheme:go_default_library",
1919
"//pkg/apis/certificates/install:go_default_library",
2020
"//pkg/controller:go_default_library",
2121
"//pkg/controller/certificates:go_default_library",

‎cmd/gke-certificates-controller/app/gke_certificates_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
restclient "k8s.io/client-go/rest"
2929
"k8s.io/client-go/tools/clientcmd"
3030
"k8s.io/client-go/tools/record"
31-
"k8s.io/kubernetes/pkg/api"
31+
"k8s.io/kubernetes/pkg/api/legacyscheme"
3232
"k8s.io/kubernetes/pkg/controller"
3333
"k8s.io/kubernetes/pkg/controller/certificates"
3434

@@ -65,7 +65,7 @@ func Run(s *GKECertificatesController) error {
6565
eventBroadcaster := record.NewBroadcaster()
6666
eventBroadcaster.StartLogging(glog.Infof)
6767
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events("")})
68-
recorder := eventBroadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: "gke-certificates-controller"})
68+
recorder := eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: "gke-certificates-controller"})
6969

7070
clientBuilder := controller.SimpleControllerClientBuilder{ClientConfig: kubeconfig}
7171
client := clientBuilder.ClientOrDie("certificate-controller")

‎cmd/gke-certificates-controller/app/gke_signer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
clientset "k8s.io/client-go/kubernetes"
3030
"k8s.io/client-go/rest"
3131
"k8s.io/client-go/tools/record"
32-
"k8s.io/kubernetes/pkg/api"
32+
"k8s.io/kubernetes/pkg/api/legacyscheme"
3333
_ "k8s.io/kubernetes/pkg/apis/certificates/install"
3434
"k8s.io/kubernetes/pkg/controller/certificates"
3535
)
@@ -50,7 +50,7 @@ type GKESigner struct {
5050

5151
// NewGKESigner will create a new instance of a GKESigner.
5252
func NewGKESigner(kubeConfigFile string, retryBackoff time.Duration, recorder record.EventRecorder, client clientset.Interface) (*GKESigner, error) {
53-
webhook, err := webhook.NewGenericWebhook(api.Registry, api.Codecs, kubeConfigFile, groupVersions, retryBackoff)
53+
webhook, err := webhook.NewGenericWebhook(legacyscheme.Registry, legacyscheme.Codecs, kubeConfigFile, groupVersions, retryBackoff)
5454
if err != nil {
5555
return nil, err
5656
}

‎cmd/kube-apiserver/app/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ go_library(
1616
deps = [
1717
"//cmd/kube-apiserver/app/options:go_default_library",
1818
"//pkg/api:go_default_library",
19+
"//pkg/api/legacyscheme:go_default_library",
1920
"//pkg/apis/apps:go_default_library",
2021
"//pkg/apis/batch:go_default_library",
2122
"//pkg/apis/extensions:go_default_library",

‎cmd/kube-apiserver/app/options/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ go_test(
6464
library = ":go_default_library",
6565
deps = [
6666
"//pkg/api:go_default_library",
67+
"//pkg/api/legacyscheme:go_default_library",
6768
"//pkg/kubeapiserver/options:go_default_library",
6869
"//pkg/kubelet/client:go_default_library",
6970
"//pkg/master/reconcilers:go_default_library",

‎cmd/kube-apiserver/app/options/options_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
utilconfig "k8s.io/apiserver/pkg/util/flag"
3131
restclient "k8s.io/client-go/rest"
3232
kapi "k8s.io/kubernetes/pkg/api"
33+
"k8s.io/kubernetes/pkg/api/legacyscheme"
3334
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
3435
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
3536
"k8s.io/kubernetes/pkg/master/reconcilers"
@@ -214,8 +215,8 @@ func TestAddFlags(t *testing.T) {
214215
CloudProvider: "azure",
215216
},
216217
StorageSerialization: &kubeoptions.StorageSerializationOptions{
217-
StorageVersions: kapi.Registry.AllPreferredGroupVersions(),
218-
DefaultStorageVersions: kapi.Registry.AllPreferredGroupVersions(),
218+
StorageVersions: legacyscheme.Registry.AllPreferredGroupVersions(),
219+
DefaultStorageVersions: legacyscheme.Registry.AllPreferredGroupVersions(),
219220
},
220221
APIEnablement: &kubeoptions.APIEnablementOptions{
221222
RuntimeConfig: utilconfig.ConfigurationMap{},

‎cmd/kube-apiserver/app/server.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import (
5858
clientgoinformers "k8s.io/client-go/informers"
5959
clientgoclientset "k8s.io/client-go/kubernetes"
6060
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
61-
"k8s.io/kubernetes/pkg/api"
61+
"k8s.io/kubernetes/pkg/api/legacyscheme"
6262
"k8s.io/kubernetes/pkg/apis/apps"
6363
"k8s.io/kubernetes/pkg/apis/batch"
6464
"k8s.io/kubernetes/pkg/apis/extensions"
@@ -84,6 +84,7 @@ import (
8484
"k8s.io/kubernetes/pkg/version"
8585
"k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/bootstrap"
8686

87+
"k8s.io/kubernetes/pkg/api"
8788
_ "k8s.io/kubernetes/pkg/util/reflector/prometheus" // for reflector metric registration
8889
_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration
8990
)
@@ -355,7 +356,7 @@ func CreateKubeAPIServerConfig(s *options.ServerRunOptions, nodeTunneler tunnele
355356

356357
// BuildGenericConfig takes the master server options and produces the genericapiserver.Config associated with it
357358
func BuildGenericConfig(s *options.ServerRunOptions, proxyTransport *http.Transport) (*genericapiserver.Config, informers.SharedInformerFactory, clientgoinformers.SharedInformerFactory, *kubeserver.InsecureServingInfo, aggregatorapiserver.ServiceResolver, error) {
358-
genericConfig := genericapiserver.NewConfig(api.Codecs)
359+
genericConfig := genericapiserver.NewConfig(legacyscheme.Codecs)
359360
if err := s.GenericServerRunOptions.ApplyTo(genericConfig); err != nil {
360361
return nil, nil, nil, nil, nil, err
361362
}
@@ -376,7 +377,7 @@ func BuildGenericConfig(s *options.ServerRunOptions, proxyTransport *http.Transp
376377
return nil, nil, nil, nil, nil, err
377378
}
378379

379-
genericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, api.Scheme)
380+
genericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, legacyscheme.Scheme)
380381
genericConfig.OpenAPIConfig.PostProcessSpec = postProcessOpenAPISpecForBackwardCompatibility
381382
genericConfig.OpenAPIConfig.Info.Title = "Kubernetes"
382383
genericConfig.SwaggerConfig = genericapiserver.DefaultSwaggerConfig()
@@ -484,7 +485,7 @@ func BuildGenericConfig(s *options.ServerRunOptions, proxyTransport *http.Transp
484485
certBytes,
485486
keyBytes,
486487
kubeClientConfig,
487-
api.Scheme,
488+
legacyscheme.Scheme,
488489
pluginInitializer)
489490
if err != nil {
490491
return nil, nil, nil, nil, nil, fmt.Errorf("failed to initialize admission: %v", err)
@@ -505,7 +506,7 @@ func BuildAdmissionPluginInitializer(s *options.ServerRunOptions, client interna
505506
}
506507

507508
// TODO: use a dynamic restmapper. See https://github.com/kubernetes/kubernetes/pull/42615.
508-
restMapper := api.Registry.RESTMapper()
509+
restMapper := legacyscheme.Registry.RESTMapper()
509510

510511
// NOTE: we do not provide informers to the quota registry because admission level decisions
511512
// do not require us to open watches for all items tracked by quota.
@@ -565,8 +566,8 @@ func BuildStorageFactory(s *options.ServerRunOptions) (*serverstorage.DefaultSto
565566
return nil, fmt.Errorf("error generating storage version map: %s", err)
566567
}
567568
storageFactory, err := kubeapiserver.NewStorageFactory(
568-
s.Etcd.StorageConfig, s.Etcd.DefaultStorageMediaType, api.Codecs,
569-
serverstorage.NewDefaultResourceEncodingConfig(api.Registry), storageGroupsToEncodingVersion,
569+
s.Etcd.StorageConfig, s.Etcd.DefaultStorageMediaType, legacyscheme.Codecs,
570+
serverstorage.NewDefaultResourceEncodingConfig(legacyscheme.Registry), storageGroupsToEncodingVersion,
570571
// FIXME (soltysh): this GroupVersionResource override should be configurable
571572
[]schema.GroupVersionResource{batch.Resource("cronjobs").WithVersion("v1beta1")},
572573
master.DefaultAPIResourceConfigSource(), s.APIEnablement.RuntimeConfig)

‎cmd/kube-apiserver/app/testing/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ go_library(
3838
deps = [
3939
"//cmd/kube-apiserver/app:go_default_library",
4040
"//cmd/kube-apiserver/app/options:go_default_library",
41-
"//pkg/api:go_default_library",
41+
"//pkg/api/legacyscheme:go_default_library",
4242
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
4343
"//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
4444
"//vendor/k8s.io/client-go/kubernetes:go_default_library",

‎cmd/kube-apiserver/app/testing/testserver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
restclient "k8s.io/client-go/rest"
3232
"k8s.io/kubernetes/cmd/kube-apiserver/app"
3333
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
34-
"k8s.io/kubernetes/pkg/api"
34+
"k8s.io/kubernetes/pkg/api/legacyscheme"
3535
)
3636

3737
// TearDownFunc is to be called to tear down a test server.
@@ -63,7 +63,7 @@ func StartTestServer(t *testing.T) (result *restclient.Config, tearDownForCaller
6363
}()
6464

6565
t.Logf("Starting etcd...")
66-
etcdServer, storageConfig := etcdtesting.NewUnsecuredEtcd3TestClientServer(t, api.Scheme)
66+
etcdServer, storageConfig := etcdtesting.NewUnsecuredEtcd3TestClientServer(t, legacyscheme.Scheme)
6767

6868
tmpDir, err = ioutil.TempDir("", "kubernetes-kube-apiserver")
6969
if err != nil {

‎cmd/kube-controller-manager/app/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ go_library(
2626
"//cmd/kube-controller-manager/app/options:go_default_library",
2727
"//pkg/api:go_default_library",
2828
"//pkg/api/install:go_default_library",
29+
"//pkg/api/legacyscheme:go_default_library",
2930
"//pkg/apis/apps/install:go_default_library",
3031
"//pkg/apis/authentication/install:go_default_library",
3132
"//pkg/apis/authorization/install:go_default_library",

‎cmd/kube-controller-manager/app/controllermanager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import (
5252
"k8s.io/client-go/tools/leaderelection"
5353
"k8s.io/client-go/tools/leaderelection/resourcelock"
5454
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
55-
"k8s.io/kubernetes/pkg/api"
55+
"k8s.io/kubernetes/pkg/api/legacyscheme"
5656
"k8s.io/kubernetes/pkg/cloudprovider"
5757
"k8s.io/kubernetes/pkg/controller"
5858
serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
@@ -224,7 +224,7 @@ func createRecorder(kubeClient *clientset.Clientset) record.EventRecorder {
224224
eventBroadcaster := record.NewBroadcaster()
225225
eventBroadcaster.StartLogging(glog.Infof)
226226
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events("")})
227-
return eventBroadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: "controller-manager"})
227+
return eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: "controller-manager"})
228228
}
229229

230230
func createClients(s *options.CMServer) (*clientset.Clientset, *clientset.Clientset, *restclient.Config, error) {

‎cmd/kube-controller-manager/app/core.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"k8s.io/client-go/dynamic"
3838
clientset "k8s.io/client-go/kubernetes"
3939
"k8s.io/kubernetes/pkg/api"
40+
"k8s.io/kubernetes/pkg/api/legacyscheme"
4041
"k8s.io/kubernetes/pkg/controller"
4142
endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"
4243
"k8s.io/kubernetes/pkg/controller/garbagecollector"
@@ -269,7 +270,7 @@ func startResourceQuotaController(ctx ControllerContext) (bool, error) {
269270

270271
func startNamespaceController(ctx ControllerContext) (bool, error) {
271272
// TODO: should use a dynamic RESTMapper built from the discovery results.
272-
restMapper := api.Registry.RESTMapper()
273+
restMapper := legacyscheme.Registry.RESTMapper()
273274

274275
// the namespace cleanup controller is very chatty. It makes lots of discovery calls and then it makes lots of delete calls
275276
// the ratelimiter negatively affects its speed. Deleting 100 total items in a namespace (that's only a few of each resource

‎cmd/kube-controller-manager/app/import_known_versions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ limitations under the License.
1515
*/
1616

1717
// TODO: Remove this file when namespace controller and garbage collector
18-
// stops using api.Registry.RESTMapper()
18+
// stops using legacyscheme.Registry.RESTMapper()
1919
package app
2020

2121
// These imports are the API groups the client will support.
2222
import (
2323
"fmt"
2424

25-
"k8s.io/kubernetes/pkg/api"
2625
_ "k8s.io/kubernetes/pkg/api/install"
26+
"k8s.io/kubernetes/pkg/api/legacyscheme"
2727
_ "k8s.io/kubernetes/pkg/apis/apps/install"
2828
_ "k8s.io/kubernetes/pkg/apis/authentication/install"
2929
_ "k8s.io/kubernetes/pkg/apis/authorization/install"
@@ -39,7 +39,7 @@ import (
3939
)
4040

4141
func init() {
42-
if missingVersions := api.Registry.ValidateEnvRequestedVersions(); len(missingVersions) != 0 {
42+
if missingVersions := legacyscheme.Registry.ValidateEnvRequestedVersions(); len(missingVersions) != 0 {
4343
panic(fmt.Sprintf("KUBE_API_VERSIONS contains versions that are not installed: %q.", missingVersions))
4444
}
4545
}

‎cmd/kubeadm/app/apis/kubeadm/install/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ go_library(
1616
deps = [
1717
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
1818
"//cmd/kubeadm/app/apis/kubeadm/v1alpha1:go_default_library",
19-
"//pkg/api:go_default_library",
19+
"//pkg/api/legacyscheme:go_default_library",
2020
"//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
2121
"//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
2222
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

‎cmd/kubeadm/app/apis/kubeadm/install/install.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"k8s.io/apimachinery/pkg/runtime"
2323
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
2424
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
25-
"k8s.io/kubernetes/pkg/api"
25+
"k8s.io/kubernetes/pkg/api/legacyscheme"
2626
)
2727

2828
func init() {
29-
Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
29+
Install(legacyscheme.GroupFactoryRegistry, legacyscheme.Registry, legacyscheme.Scheme)
3030
}
3131

3232
// Install registers the API group and adds types to a scheme

‎cmd/kubeadm/app/cmd/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ go_library(
5151
"//cmd/kubeadm/app/util/pubkeypin:go_default_library",
5252
"//cmd/kubeadm/app/util/token:go_default_library",
5353
"//pkg/api:go_default_library",
54+
"//pkg/api/legacyscheme:go_default_library",
5455
"//pkg/bootstrap/api:go_default_library",
5556
"//pkg/kubectl/cmd/util:go_default_library",
5657
"//pkg/kubectl/util/i18n:go_default_library",

‎cmd/kubeadm/app/cmd/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
3434
configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
3535
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
36-
"k8s.io/kubernetes/pkg/api"
36+
"k8s.io/kubernetes/pkg/api/legacyscheme"
3737
)
3838

3939
// NewCmdConfig returns cobra.Command for "kubeadm config" command
@@ -134,7 +134,7 @@ func NewCmdConfigUploadFromFile(out io.Writer, kubeConfigFile *string) *cobra.Co
134134
// NewCmdConfigUploadFromFlags returs cobra.Command for "kubeadm config upload from-flags" command
135135
func NewCmdConfigUploadFromFlags(out io.Writer, kubeConfigFile *string) *cobra.Command {
136136
cfg := &kubeadmapiext.MasterConfiguration{}
137-
api.Scheme.Default(cfg)
137+
legacyscheme.Scheme.Default(cfg)
138138

139139
var featureGatesString string
140140

‎cmd/kubeadm/app/cmd/init.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import (
5757
dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun"
5858
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
5959
"k8s.io/kubernetes/cmd/kubeadm/app/util/pubkeypin"
60-
"k8s.io/kubernetes/pkg/api"
60+
"k8s.io/kubernetes/pkg/api/legacyscheme"
6161
"k8s.io/kubernetes/pkg/util/version"
6262
)
6363

@@ -103,7 +103,7 @@ var (
103103
// NewCmdInit returns "kubeadm init" command.
104104
func NewCmdInit(out io.Writer) *cobra.Command {
105105
cfg := &kubeadmapiext.MasterConfiguration{}
106-
api.Scheme.Default(cfg)
106+
legacyscheme.Scheme.Default(cfg)
107107

108108
var cfgPath string
109109
var skipPreFlight bool
@@ -120,9 +120,9 @@ func NewCmdInit(out io.Writer) *cobra.Command {
120120
kubeadmutil.CheckErr(err)
121121
}
122122

123-
api.Scheme.Default(cfg)
123+
legacyscheme.Scheme.Default(cfg)
124124
internalcfg := &kubeadmapi.MasterConfiguration{}
125-
api.Scheme.Convert(cfg, internalcfg, nil)
125+
legacyscheme.Scheme.Convert(cfg, internalcfg, nil)
126126

127127
i, err := NewInit(cfgPath, internalcfg, skipPreFlight, skipTokenPrint, dryRun)
128128
kubeadmutil.CheckErr(err)
@@ -220,7 +220,7 @@ func NewInit(cfgPath string, cfg *kubeadmapi.MasterConfiguration, skipPreFlight,
220220
if err != nil {
221221
return nil, fmt.Errorf("unable to read config from %q [%v]", cfgPath, err)
222222
}
223-
if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), b, cfg); err != nil {
223+
if err := runtime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), b, cfg); err != nil {
224224
return nil, fmt.Errorf("unable to decode config from %q [%v]", cfgPath, err)
225225
}
226226
}

‎cmd/kubeadm/app/cmd/join.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
3737
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
3838
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
39-
"k8s.io/kubernetes/pkg/api"
39+
"k8s.io/kubernetes/pkg/api/legacyscheme"
4040
nodeutil "k8s.io/kubernetes/pkg/util/node"
4141
)
4242

@@ -96,7 +96,7 @@ var (
9696
// NewCmdJoin returns "kubeadm join" command.
9797
func NewCmdJoin(out io.Writer) *cobra.Command {
9898
cfg := &kubeadmapiext.NodeConfiguration{}
99-
api.Scheme.Default(cfg)
99+
legacyscheme.Scheme.Default(cfg)
100100

101101
var skipPreFlight bool
102102
var cfgPath string
@@ -108,9 +108,9 @@ func NewCmdJoin(out io.Writer) *cobra.Command {
108108
Run: func(cmd *cobra.Command, args []string) {
109109
cfg.DiscoveryTokenAPIServers = args
110110

111-
api.Scheme.Default(cfg)
111+
legacyscheme.Scheme.Default(cfg)
112112
internalcfg := &kubeadmapi.NodeConfiguration{}
113-
api.Scheme.Convert(cfg, internalcfg, nil)
113+
legacyscheme.Scheme.Convert(cfg, internalcfg, nil)
114114

115115
j, err := NewJoin(cfgPath, args, internalcfg, skipPreFlight)
116116
kubeadmutil.CheckErr(err)
@@ -180,7 +180,7 @@ func NewJoin(cfgPath string, args []string, cfg *kubeadmapi.NodeConfiguration, s
180180
if err != nil {
181181
return nil, fmt.Errorf("unable to read config from %q [%v]", cfgPath, err)
182182
}
183-
if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), b, cfg); err != nil {
183+
if err := runtime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), b, cfg); err != nil {
184184
return nil, fmt.Errorf("unable to decode config from %q [%v]", cfgPath, err)
185185
}
186186
}

0 commit comments

Comments
 (0)