github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121230 from SataQiu/fix-kubeadm-20231014

Browse Source 
kubeadm: fill with the DefaultCRISocket when CRI socket detection is not required
This commit is contained in:
Kubernetes Prow Robot 2023-10-16 06:45:18 +02:00 committed by GitHub
commit afc302c2d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubeadm/app/cmd/config.go
View File

@ -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 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) }, opts)
if err != nil { if err != nil {
return []byte{}, err return []byte{}, err
@ -238,9 +235,7 @@ func getDefaultResetConfigBytes() ([]byte, error) {
opts := configutil.LoadOrDefaultConfigurationOptions{ opts := configutil.LoadOrDefaultConfigurationOptions{
SkipCRIDetect: true, SkipCRIDetect: true,
} }
internalcfg, err := configutil.DefaultedResetConfiguration(&kubeadmapiv1.ResetConfiguration{ internalcfg, err := configutil.DefaultedResetConfiguration(&kubeadmapiv1.ResetConfiguration{}, opts)
CRISocket: constants.DefaultCRISocket, // avoid CRI detection
}, opts)
if err != nil { if err != nil {
return []byte{}, err return []byte{}, err
} }

4
cmd/kubeadm/app/util/config/initconfiguration.go
View File

@ -111,8 +111,8 @@ func SetNodeRegistrationDynamicDefaults(cfg *kubeadmapi.NodeRegistrationOptions,
if cfg.CRISocket == "" { if cfg.CRISocket == "" {
if skipCRIDetect { if skipCRIDetect {
klog.V(4).Infof("skip CRI socket detection, fill with placeholder %s", kubeadmconstants.UnknownCRISocket) klog.V(4).Infof("skip CRI socket detection, fill with the default CRI socket %s", kubeadmconstants.DefaultCRISocket)
cfg.CRISocket = kubeadmconstants.UnknownCRISocket // set a value to pass the ValidateSocketPath cfg.CRISocket = kubeadmconstants.DefaultCRISocket
return nil return nil
} }
cfg.CRISocket, err = kubeadmruntime.DetectCRISocket() cfg.CRISocket, err = kubeadmruntime.DetectCRISocket()

4
cmd/kubeadm/app/util/config/resetconfiguration.go
View File

@ -40,8 +40,8 @@ func SetResetDynamicDefaults(cfg *kubeadmapi.ResetConfiguration, skipCRIDetect b
var err error var err error
if cfg.CRISocket == "" { if cfg.CRISocket == "" {
if skipCRIDetect { if skipCRIDetect {
klog.V(4).Infof("skip CRI socket detection, fill with placeholder %s", constants.UnknownCRISocket) klog.V(4).Infof("skip CRI socket detection, fill with the default CRI socket %s", constants.DefaultCRISocket)
cfg.CRISocket = constants.UnknownCRISocket // set a value to pass the ValidateSocketPath cfg.CRISocket = constants.DefaultCRISocket
return nil return nil
} }
cfg.CRISocket, err = kubeadmruntime.DetectCRISocket() cfg.CRISocket, err = kubeadmruntime.DetectCRISocket()