Merge pull request kubernetes#88623 from rajansandeep/unsupportedbug

k8s-ci-robot · web-flow · commit 2b9e782a6226 · 2020-02-27T09:45:27.000-08:00
[kubeadm]: Fix CoreDNS unsupported preflight check
diff --git a/cmd/kubeadm/app/phases/upgrade/preflight.go b/cmd/kubeadm/app/phases/upgrade/preflight.go
@@ -85,7 +85,7 @@ func checkUnsupportedPlugins(client clientset.Interface) error {
 	if err != nil {
 		return err
 	}
-	if unsupportedCoreDNS != nil {
+	if len(unsupportedCoreDNS) != 0 {
 		var UnsupportedPlugins []string
 		for _, unsup := range unsupportedCoreDNS {
 			UnsupportedPlugins = append(UnsupportedPlugins, unsup.ToString())

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func checkUnsupportedPlugins(client clientset.Interface) error {`
`85`	`85`	`if err != nil {`
`86`	`86`	`return err`
`87`	`87`	`}`
`88`		`- if unsupportedCoreDNS != nil {`
	`88`	`+ if len(unsupportedCoreDNS) != 0 {`
`89`	`89`	`var UnsupportedPlugins []string`
`90`	`90`	`for _, unsup := range unsupportedCoreDNS {`
`91`	`91`	`UnsupportedPlugins = append(UnsupportedPlugins, unsup.ToString())`