Merge pull request #46724 from deads2k/agg-32-startup

Automatic merge from submit-queue (batch tested with PRs 36721, 46483, 45500, 46724, 46036) stop special casing the loopback connection for aggregator Fixes a TODO for the aggregator loopback connection.

Merge pull request #46724 from deads2k/agg-32-startup
7d599cc1 · Kubernetes Submit Queue · GitHub · 4220b730 · b5737d1c · 7d599cc1
Commit 7d599cc1 authored Jun 03, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

BUILD cmd/kube-apiserver/app/BUILD +1 -0

aggregator.go cmd/kube-apiserver/app/aggregator.go +2 -6

No files found.
--- a/cmd/kube-apiserver/app/BUILD
+++ b/cmd/kube-apiserver/app/BUILD
@@ -92,6 +92,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",

--- 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}