public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 23:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync datastore config defaults with kine CLI

Browse Source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 10e3d40bf3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson
2025-05-09 20:01:30 +00:00
committed by Brad Davidson
parent 34e81a6613
commit 8053523ea1
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/cli/server/server.go
View File

@@ -150,12 +150,17 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
serverConfig.ControlConfig.ExtraEtcdArgs = cfg.ExtraEtcdArgs.Value()
serverConfig.ControlConfig.ExtraSchedulerAPIArgs = cfg.ExtraSchedulerArgs.Value()
serverConfig.ControlConfig.ClusterDomain = cfg.ClusterDomain
serverConfig.ControlConfig.Datastore.NotifyInterval = 5 * time.Second
serverConfig.ControlConfig.Datastore.EmulatedETCDVersion = etcdversion.Version
serverConfig.ControlConfig.Datastore.Endpoint = cfg.DatastoreEndpoint
serverConfig.ControlConfig.Datastore.BackendTLSConfig.CAFile = cfg.DatastoreCAFile
serverConfig.ControlConfig.Datastore.BackendTLSConfig.CertFile = cfg.DatastoreCertFile
serverConfig.ControlConfig.Datastore.BackendTLSConfig.KeyFile = cfg.DatastoreKeyFile
serverConfig.ControlConfig.Datastore.CompactBatchSize = 1000
serverConfig.ControlConfig.Datastore.CompactInterval = 5 * time.Minute
serverConfig.ControlConfig.Datastore.CompactMinRetain = 1000
serverConfig.ControlConfig.Datastore.CompactTimeout = 5 * time.Second
serverConfig.ControlConfig.Datastore.EmulatedETCDVersion = etcdversion.Version
serverConfig.ControlConfig.Datastore.Endpoint = cfg.DatastoreEndpoint
serverConfig.ControlConfig.Datastore.NotifyInterval = 5 * time.Second
serverConfig.ControlConfig.Datastore.PollBatchSize = 500
serverConfig.ControlConfig.KineTLS = cfg.KineTLS
serverConfig.ControlConfig.AdvertiseIP = cfg.AdvertiseIP
serverConfig.ControlConfig.AdvertisePort = cfg.AdvertisePort

11
pkg/daemons/control/server_test.go
View File

@@ -19,7 +19,9 @@ import (
"github.com/k3s-io/k3s/pkg/etcd"
testutil "github.com/k3s-io/k3s/tests"
"github.com/k3s-io/k3s/tests/mock"
"github.com/k3s-io/kine/pkg/endpoint"
pkgerrors "github.com/pkg/errors"
etcdversion "go.etcd.io/etcd/api/v3/version"
utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/request/anonymous"
@@ -183,6 +185,15 @@ func mockControl(ctx context.Context, t *testing.T, clusterInit bool) (*config.C
ServerNodeName: "k3s-server-1",
ServiceNodePortRange: &utilnet.PortRange{Base: 30000, Size: 2048},
Token: "token",
Datastore: endpoint.Config{
CompactBatchSize: 1000,
CompactInterval: 5 * time.Minute,
CompactMinRetain: 1000,
CompactTimeout: 5 * time.Second,
EmulatedETCDVersion: etcdversion.Version,
NotifyInterval: 5 * time.Second,
PollBatchSize: 500,
},
}
if err := os.Chdir(control.DataDir); err != nil {