From 32d2afe42bc6595d5483579caf26d97d505212b9 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Sat, 14 Oct 2023 16:21:38 +0800 Subject: [PATCH] kubeadm: fill with the DefaultCRISocket when CRI socket detection is not required --- cmd/kubeadm/app/cmd/config.go | 7 +------ cmd/kubeadm/app/util/config/initconfiguration.go | 4 ++-- cmd/kubeadm/app/util/config/resetconfiguration.go | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index 91208ea190b..e19d10e5656 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -223,9 +223,6 @@ func getDefaultNodeConfigBytes() ([]byte, error) { UnsafeSkipCAVerification: true, // TODO: UnsafeSkipCAVerification: true needs to be set for validation to pass, but shouldn't be recommended as the default }, }, - NodeRegistration: kubeadmapiv1old.NodeRegistrationOptions{ - CRISocket: constants.DefaultCRISocket, // avoid CRI detection - }, }, opts) if err != nil { return []byte{}, err @@ -238,9 +235,7 @@ func getDefaultResetConfigBytes() ([]byte, error) { opts := configutil.LoadOrDefaultConfigurationOptions{ SkipCRIDetect: true, } - internalcfg, err := configutil.DefaultedResetConfiguration(&kubeadmapiv1.ResetConfiguration{ - CRISocket: constants.DefaultCRISocket, // avoid CRI detection - }, opts) + internalcfg, err := configutil.DefaultedResetConfiguration(&kubeadmapiv1.ResetConfiguration{}, opts) if err != nil { return []byte{}, err } diff --git a/cmd/kubeadm/app/util/config/initconfiguration.go b/cmd/kubeadm/app/util/config/initconfiguration.go index fd93d7c3b84..9ee852cd5f4 100644 --- a/cmd/kubeadm/app/util/config/initconfiguration.go +++ b/cmd/kubeadm/app/util/config/initconfiguration.go @@ -111,8 +111,8 @@ func SetNodeRegistrationDynamicDefaults(cfg *kubeadmapi.NodeRegistrationOptions, if cfg.CRISocket == "" { if skipCRIDetect { - klog.V(4).Infof("skip CRI socket detection, fill with placeholder %s", kubeadmconstants.UnknownCRISocket) - cfg.CRISocket = kubeadmconstants.UnknownCRISocket // set a value to pass the ValidateSocketPath + klog.V(4).Infof("skip CRI socket detection, fill with the default CRI socket %s", kubeadmconstants.DefaultCRISocket) + cfg.CRISocket = kubeadmconstants.DefaultCRISocket return nil } cfg.CRISocket, err = kubeadmruntime.DetectCRISocket() diff --git a/cmd/kubeadm/app/util/config/resetconfiguration.go b/cmd/kubeadm/app/util/config/resetconfiguration.go index 81a39da2bb3..9335db9c264 100644 --- a/cmd/kubeadm/app/util/config/resetconfiguration.go +++ b/cmd/kubeadm/app/util/config/resetconfiguration.go @@ -40,8 +40,8 @@ func SetResetDynamicDefaults(cfg *kubeadmapi.ResetConfiguration, skipCRIDetect b var err error if cfg.CRISocket == "" { if skipCRIDetect { - klog.V(4).Infof("skip CRI socket detection, fill with placeholder %s", constants.UnknownCRISocket) - cfg.CRISocket = constants.UnknownCRISocket // set a value to pass the ValidateSocketPath + klog.V(4).Infof("skip CRI socket detection, fill with the default CRI socket %s", constants.DefaultCRISocket) + cfg.CRISocket = constants.DefaultCRISocket return nil } cfg.CRISocket, err = kubeadmruntime.DetectCRISocket()