From 814a30379c5b92813f2c3d4e069503bbda7fc847 Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Mon, 23 Oct 2017 10:41:00 -0500 Subject: [PATCH] change alpha-endpoint-reconciler-type to endpoint-reconciler-type * Putting 'experimental' or 'alpha' into names has been known to cause issues during promotion --- cmd/kube-apiserver/app/options/options.go | 2 +- cmd/kube-apiserver/app/options/options_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 727edd15edf..04587a21ba2 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -166,7 +166,7 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) { fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount, "The number of apiservers running in the cluster, must be a positive number.") - fs.StringVar(&s.EndpointReconcilerType, "alpha-endpoint-reconciler-type", string(s.EndpointReconcilerType), + fs.StringVar(&s.EndpointReconcilerType, "endpoint-reconciler-type", string(s.EndpointReconcilerType), "Use an endpoint reconciler ("+strings.Join(reconcilers.AllTypes.Names(), ", ")+")") // See #14282 for details on how to test/try this option out. diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index 4f32ca55a6a..f8b317a2f29 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -46,7 +46,6 @@ func TestAddFlags(t *testing.T) { "--admission-control-config-file=/admission-control-config", "--advertise-address=192.168.10.10", "--allow-privileged=false", - "--alpha-endpoint-reconciler-type=" + string(reconcilers.MasterCountReconcilerType), "--anonymous-auth=false", "--apiserver-count=5", "--audit-log-maxage=11", @@ -72,6 +71,7 @@ func TestAddFlags(t *testing.T) { "--enable-aggregator-routing=true", "--enable-logs-handler=false", "--enable-swagger-ui=true", + "--endpoint-reconciler-type=" + string(reconcilers.MasterCountReconcilerType), "--etcd-quorum-read=false", "--etcd-keyfile=/var/run/kubernetes/etcd.key", "--etcd-certfile=/var/run/kubernetes/etcdce.crt",