Skip to content

Commit bcce1a0

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#54419 from rphillips/fixes/change_endpoint_reconciler_type
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](kubernetes#50984 (comment)) we are preferring to document the flags. **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
2 parents 94e77bd + 814a303 commit bcce1a0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmd/kube-apiserver/app/options/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
170170
fs.IntVar(&s.MasterCount, "apiserver-count", s.MasterCount,
171171
"The number of apiservers running in the cluster, must be a positive number.")
172172

173-
fs.StringVar(&s.EndpointReconcilerType, "alpha-endpoint-reconciler-type", string(s.EndpointReconcilerType),
173+
fs.StringVar(&s.EndpointReconcilerType, "endpoint-reconciler-type", string(s.EndpointReconcilerType),
174174
"Use an endpoint reconciler ("+strings.Join(reconcilers.AllTypes.Names(), ", ")+")")
175175

176176
// See #14282 for details on how to test/try this option out.

cmd/kube-apiserver/app/options/options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func TestAddFlags(t *testing.T) {
4646
"--admission-control-config-file=/admission-control-config",
4747
"--advertise-address=192.168.10.10",
4848
"--allow-privileged=false",
49-
"--alpha-endpoint-reconciler-type=" + string(reconcilers.MasterCountReconcilerType),
5049
"--anonymous-auth=false",
5150
"--apiserver-count=5",
5251
"--audit-log-maxage=11",
@@ -72,6 +71,7 @@ func TestAddFlags(t *testing.T) {
7271
"--enable-aggregator-routing=true",
7372
"--enable-logs-handler=false",
7473
"--enable-swagger-ui=true",
74+
"--endpoint-reconciler-type=" + string(reconcilers.MasterCountReconcilerType),
7575
"--etcd-quorum-read=false",
7676
"--etcd-keyfile=/var/run/kubernetes/etcd.key",
7777
"--etcd-certfile=/var/run/kubernetes/etcdce.crt",

0 commit comments

Comments
 (0)