From 74274e5a8213365deb2e8681ce39112165f5417c Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 4 Nov 2024 21:48:45 +0000 Subject: [PATCH] Set kine EmulatedETCDVersion from embedded etcd version Signed-off-by: Brad Davidson (cherry picked from commit bc60ff79f6ee5fc784a8bbcaab9b502bc304b2f6) Signed-off-by: Brad Davidson --- pkg/cli/server/server.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go index 1f98628078..91e4cccb4f 100644 --- a/pkg/cli/server/server.go +++ b/pkg/cli/server/server.go @@ -32,6 +32,7 @@ import ( "github.com/rancher/wrangler/pkg/signals" "github.com/sirupsen/logrus" "github.com/urfave/cli" + etcdversion "go.etcd.io/etcd/api/v3/version" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilnet "k8s.io/apimachinery/pkg/util/net" kubeapiserverflag "k8s.io/component-base/cli/flag" @@ -147,6 +148,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont serverConfig.ControlConfig.ExtraSchedulerAPIArgs = cfg.ExtraSchedulerArgs 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