From c1c4489a5dc9fca8bc9cbadc7f2ff856845bd1cf Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Tue, 6 Dec 2016 12:02:18 +0100
Subject: [PATCH] Remove genericapiserver.Options.MasterServiceNamespace

---
 pkg/genericapiserver/options/server_run_options.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/genericapiserver/options/server_run_options.go b/pkg/genericapiserver/options/server_run_options.go
index 65df7f219c0..134a4c781a6 100644
--- a/pkg/genericapiserver/options/server_run_options.go
+++ b/pkg/genericapiserver/options/server_run_options.go
@@ -62,7 +62,6 @@ type ServerRunOptions struct {
 	KubernetesServiceNodePort   int
 	LongRunningRequestRE        string
 	MasterCount                 int
-	MasterServiceNamespace      string
 	MaxRequestsInFlight         int
 	MaxMutatingRequestsInFlight int
 	MinRequestTimeout           int
@@ -90,7 +89,6 @@ func NewServerRunOptions() *ServerRunOptions {
 		EnableWatchCache:            true,
 		LongRunningRequestRE:        DefaultLongRunningRequestRE,
 		MasterCount:                 1,
-		MasterServiceNamespace:      api.NamespaceDefault,
 		MaxRequestsInFlight:         400,
 		MaxMutatingRequestsInFlight: 200,
 		MinRequestTimeout:           1800,
@@ -250,7 +248,8 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount,
 		"The number of apiservers running in the cluster.")
 
-	fs.StringVar(&s.MasterServiceNamespace, "master-service-namespace", s.MasterServiceNamespace, ""+
+	deprecatedMasterServiceNamespace := api.NamespaceDefault
+	fs.StringVar(&deprecatedMasterServiceNamespace, "master-service-namespace", deprecatedMasterServiceNamespace, ""+
 		"DEPRECATED: the namespace from which the kubernetes master services should be injected into pods.")
 
 	fs.IntVar(&s.MaxRequestsInFlight, "max-requests-inflight", s.MaxRequestsInFlight, ""+