From b5737d1c12afd44d1d52a1e2c8166f4a924b19c3 Mon Sep 17 00:00:00 2001 From: deads2k Date: Wed, 31 May 2017 15:52:32 -0400 Subject: [PATCH] stop special casing the loopback connection for aggregator --- cmd/kube-apiserver/app/BUILD | 1 + cmd/kube-apiserver/app/aggregator.go | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index aa343ba063c..26bfee3df1d 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -89,6 +89,7 @@ go_library( "//vendor/k8s.io/apiserver/pkg/server/storage:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", + "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apiserver:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/controllers/autoregister:go_default_library", diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go index 3aa6279b93d..bbdc069ff71 100644 --- a/cmd/kube-apiserver/app/aggregator.go +++ b/cmd/kube-apiserver/app/aggregator.go @@ -33,6 +33,7 @@ import ( genericoptions "k8s.io/apiserver/pkg/server/options" kubeclientset "k8s.io/client-go/kubernetes" "k8s.io/kube-aggregator/pkg/apis/apiregistration" + "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver" apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" "k8s.io/kube-aggregator/pkg/controllers/autoregister" @@ -52,14 +53,9 @@ func createAggregatorConfig(kubeAPIServerConfig genericapiserver.Config, command genericConfig.OpenAPIConfig = nil genericConfig.SwaggerConfig = nil - // copy the loopbackclientconfig. We're going to change the contenttype back to json until we get protobuf serializations for it - t := *kubeAPIServerConfig.LoopbackClientConfig - genericConfig.LoopbackClientConfig = &t - genericConfig.LoopbackClientConfig.ContentConfig.ContentType = "" - // copy the etcd options so we don't mutate originals. etcdOptions := *commandOptions.Etcd - etcdOptions.StorageConfig.Codec = aggregatorapiserver.Codecs.LegacyCodec(schema.GroupVersion{Group: "apiregistration.k8s.io", Version: "v1beta1"}) + etcdOptions.StorageConfig.Codec = aggregatorapiserver.Codecs.LegacyCodec(v1beta1.SchemeGroupVersion) etcdOptions.StorageConfig.Copier = aggregatorapiserver.Scheme genericConfig.RESTOptionsGetter = &genericoptions.SimpleRestOptionsFactory{Options: etcdOptions}