github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97620 from rajansandeep/patch-1

Browse Source 
[kubeadm]: CoreDNS preflight: Parse correct version syntax
This commit is contained in:
Kubernetes Prow Robot 2021-01-05 04:49:58 -08:00 committed by GitHub
commit 42fe1d3405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/phases/upgrade/preflight.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"os" "os"
"strings"
"github.com/coredns/corefile-migration/migration" "github.com/coredns/corefile-migration/migration"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -116,7 +117,7 @@ func checkMigration(client clientset.Interface) error {
return err return err
} }
_, err = migration.Migrate(currentInstalledCoreDNSversion, kubeadmconstants.CoreDNSVersion, corefile, false) _, err = migration.Migrate(currentInstalledCoreDNSversion, strings.TrimLeft(kubeadmconstants.CoreDNSVersion, "v"), corefile, false)
if err != nil { if err != nil {
return errors.Wrap(err, "CoreDNS will not be upgraded") return errors.Wrap(err, "CoreDNS will not be upgraded")
} }