github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54419 from rphillips/fixes/change_endpoint_reconciler_type

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 54419, 53545). 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>.

change alpha-endpoint-reconciler-type argument to endpoint-reconciler-type

**What this PR does / why we need it**: Tweaks the endpoint reconciler argument to remove 'alpha', because according to this [comment](https://github.com/kubernetes/kubernetes/pull/50984#discussion_r146290402) we are preferring to document the flags.

**Special notes for your reviewer**:

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-27 00:14:18 -07:00 committed by GitHub
commit bcce1a0298
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/options/options.go
View File

@ -170,7 +170,7 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount, fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount,
"The number of apiservers running in the cluster, must be a positive number.") "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(), ", ")+")") "Use an endpoint reconciler ("+strings.Join(reconcilers.AllTypes.Names(), ", ")+")")
// See #14282 for details on how to test/try this option out. // See #14282 for details on how to test/try this option out.

2
cmd/kube-apiserver/app/options/options_test.go
View File

@ -46,7 +46,6 @@ func TestAddFlags(t *testing.T) {
"--admission-control-config-file=/admission-control-config", "--admission-control-config-file=/admission-control-config",
"--advertise-address=192.168.10.10", "--advertise-address=192.168.10.10",
"--allow-privileged=false", "--allow-privileged=false",
"--alpha-endpoint-reconciler-type=" + string(reconcilers.MasterCountReconcilerType),
"--anonymous-auth=false", "--anonymous-auth=false",
"--apiserver-count=5", "--apiserver-count=5",
"--audit-log-maxage=11", "--audit-log-maxage=11",
@ -72,6 +71,7 @@ func TestAddFlags(t *testing.T) {
"--enable-aggregator-routing=true", "--enable-aggregator-routing=true",
"--enable-logs-handler=false", "--enable-logs-handler=false",
"--enable-swagger-ui=true", "--enable-swagger-ui=true",
"--endpoint-reconciler-type=" + string(reconcilers.MasterCountReconcilerType),
"--etcd-quorum-read=false", "--etcd-quorum-read=false",
"--etcd-keyfile=/var/run/kubernetes/etcd.key", "--etcd-keyfile=/var/run/kubernetes/etcd.key",
"--etcd-certfile=/var/run/kubernetes/etcdce.crt", "--etcd-certfile=/var/run/kubernetes/etcdce.crt",