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

Merge pull request #118306 from SataQiu/fix-kubeadm-20230529

Browse Source 
kubeadm: lower the log level of EtcdSupportedVersion warning message as it is a kubeadm internal warning
This commit is contained in:
Kubernetes Prow Robot 2023-05-28 22:51:42 -07:00 committed by GitHub
commit 11067ceb32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/images/images.go
View File

@ -77,7 +77,7 @@ func GetEtcdImage(cfg *kubeadmapi.ClusterConfiguration) string {
etcdImageTag = etcdVersion.String() etcdImageTag = etcdVersion.String()
} }
if warning != nil { if warning != nil {
klog.Warningln(warning) klog.V(1).Infof("WARNING: %v", warning)
} }
// unless an override is specified // unless an override is specified
if cfg.Etcd.Local != nil && cfg.Etcd.Local.ImageTag != "" { if cfg.Etcd.Local != nil && cfg.Etcd.Local.ImageTag != "" {

2
cmd/kubeadm/app/phases/upgrade/compute.go
View File

@ -304,7 +304,7 @@ func getSuggestedEtcdVersion(externalEtcd bool, kubernetesVersion string) string
return "N/A" return "N/A"
} }
if warning != nil { if warning != nil {
klog.Warningf("[upgrade/versions] %v", warning) klog.V(1).Infof("[upgrade/versions] WARNING: %v", warning)
} }
return etcdVersion.String() return etcdVersion.String()
} }

2
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -302,7 +302,7 @@ func performEtcdStaticPodUpgrade(certsRenewMgr *renewal.Manager, client clientse
return true, errors.Wrap(err, "failed to retrieve an etcd version for the target Kubernetes version") return true, errors.Wrap(err, "failed to retrieve an etcd version for the target Kubernetes version")
} }
if warning != nil { if warning != nil {
klog.Warningf("[upgrade/etcd] %v", warning) klog.V(1).Infof("[upgrade/etcd] WARNING: %v", warning)
} }
} }