github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63380 from liggitt/revert-lease

Browse Source 
Automatic merge from submit-queue. 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>.

Revert "apiserver: change default reconciler to LeaseEndpoint"

This reverts commit 0227534e99.

Temporarily revert while the root cause for https://github.com/kubernetes/kubernetes/issues/63378 is determined
This commit is contained in:
Kubernetes Submit Queue
2018-05-02 16:42:54 -07:00
committed by GitHub
parent 0d43bdec2b 0cffc7eef5
commit 360ecd7cc8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ func NewServerRunOptions() *ServerRunOptions {
EnableLogsHandler: true, EnableLogsHandler: true,
EventTTL: 1 * time.Hour, EventTTL: 1 * time.Hour,
MasterCount: 1, MasterCount: 1,
EndpointReconcilerType: string(reconcilers.LeaseEndpointReconcilerType), EndpointReconcilerType: string(reconcilers.MasterCountReconcilerType),
KubeletConfig: kubeletclient.KubeletClientConfig{ KubeletConfig: kubeletclient.KubeletClientConfig{
Port: ports.KubeletPort, Port: ports.KubeletPort,
ReadOnlyPort: ports.KubeletReadOnlyPort, ReadOnlyPort: ports.KubeletReadOnlyPort,
@@ -167,7 +167,7 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
"Currently only applies to long-running requests.") "Currently only applies to long-running requests.")
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. (In use when --endpoint-reconciler-type=master-count is enabled.)") "The number of apiservers running in the cluster, must be a positive number.")
fs.StringVar(&s.EndpointReconcilerType, "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(), ", ")+")")

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

@@ -96,7 +96,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.LeaseEndpointReconcilerType), "--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",
@@ -120,7 +120,7 @@ func TestAddFlags(t *testing.T) {
ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange, ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange,
ServiceClusterIPRange: kubeoptions.DefaultServiceIPCIDR, ServiceClusterIPRange: kubeoptions.DefaultServiceIPCIDR,
MasterCount: 5, MasterCount: 5,
EndpointReconcilerType: string(reconcilers.LeaseEndpointReconcilerType), EndpointReconcilerType: string(reconcilers.MasterCountReconcilerType),
AllowPrivileged: false, AllowPrivileged: false,
GenericServerRunOptions: &apiserveroptions.ServerRunOptions{ GenericServerRunOptions: &apiserveroptions.ServerRunOptions{
AdvertiseAddress: net.ParseIP("192.168.10.10"), AdvertiseAddress: net.ParseIP("192.168.10.10"),