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

bump coredns to 1.8.0

Browse Source
This commit is contained in:
Sandeep Rajan 2020-11-10 15:32:48 -05:00
parent 0ad06e991a
commit 40862c3b60
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -49,7 +49,7 @@ dependencies:
match: k8s.gcr.io/coredns match: k8s.gcr.io/coredns
- name: "coredns-kubeadm" - name: "coredns-kubeadm"
version: 1.7.0 version: 1.8.0
refPaths: refPaths:
- path: cmd/kubeadm/app/constants/constants.go - path: cmd/kubeadm/app/constants/constants.go
match: CoreDNSVersion = match: CoreDNSVersion =

10
cmd/kubeadm/app/cmd/config_test.go
View File

@ -249,7 +249,7 @@ k8s.gcr.io/kube-scheduler:{{.KubeVersion}}
k8s.gcr.io/kube-proxy:{{.KubeVersion}} k8s.gcr.io/kube-proxy:{{.KubeVersion}}
k8s.gcr.io/pause:{{.PauseVersion}} k8s.gcr.io/pause:{{.PauseVersion}}
k8s.gcr.io/etcd:{{.EtcdVersion}} k8s.gcr.io/etcd:{{.EtcdVersion}}
k8s.gcr.io/coredns:{{.CoreDNSVersion}} k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}
`, `,
}, },
{ {
@ -268,7 +268,7 @@ k8s.gcr.io/coredns:{{.CoreDNSVersion}}
"k8s.gcr.io/kube-proxy:{{.KubeVersion}}", "k8s.gcr.io/kube-proxy:{{.KubeVersion}}",
"k8s.gcr.io/pause:{{.PauseVersion}}", "k8s.gcr.io/pause:{{.PauseVersion}}",
"k8s.gcr.io/etcd:{{.EtcdVersion}}", "k8s.gcr.io/etcd:{{.EtcdVersion}}",
"k8s.gcr.io/coredns:{{.CoreDNSVersion}}" "k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}"
] ]
} }
`, `,
@ -287,7 +287,7 @@ images:
- k8s.gcr.io/kube-proxy:{{.KubeVersion}} - k8s.gcr.io/kube-proxy:{{.KubeVersion}}
- k8s.gcr.io/pause:{{.PauseVersion}} - k8s.gcr.io/pause:{{.PauseVersion}}
- k8s.gcr.io/etcd:{{.EtcdVersion}} - k8s.gcr.io/etcd:{{.EtcdVersion}}
- k8s.gcr.io/coredns:{{.CoreDNSVersion}} - k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}
kind: Images kind: Images
`, `,
}, },
@ -303,7 +303,7 @@ k8s.gcr.io/kube-scheduler:{{.KubeVersion}}
k8s.gcr.io/kube-proxy:{{.KubeVersion}} k8s.gcr.io/kube-proxy:{{.KubeVersion}}
k8s.gcr.io/pause:{{.PauseVersion}} k8s.gcr.io/pause:{{.PauseVersion}}
k8s.gcr.io/etcd:{{.EtcdVersion}} k8s.gcr.io/etcd:{{.EtcdVersion}}
k8s.gcr.io/coredns:{{.CoreDNSVersion}} k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}
`, `,
}, },
{ {
@ -313,7 +313,7 @@ k8s.gcr.io/coredns:{{.CoreDNSVersion}}
}, },
outputFormat: `jsonpath={range.images[*]}{@} {end}`, outputFormat: `jsonpath={range.images[*]}{@} {end}`,
expectedOutput: "k8s.gcr.io/kube-apiserver:{{.KubeVersion}} k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} k8s.gcr.io/kube-scheduler:{{.KubeVersion}} " + expectedOutput: "k8s.gcr.io/kube-apiserver:{{.KubeVersion}} k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} k8s.gcr.io/kube-scheduler:{{.KubeVersion}} " +
"k8s.gcr.io/kube-proxy:{{.KubeVersion}} k8s.gcr.io/pause:{{.PauseVersion}} k8s.gcr.io/etcd:{{.EtcdVersion}} k8s.gcr.io/coredns:{{.CoreDNSVersion}} ", "k8s.gcr.io/kube-proxy:{{.KubeVersion}} k8s.gcr.io/pause:{{.PauseVersion}} k8s.gcr.io/etcd:{{.EtcdVersion}} k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} ",
}, },
} }

4
cmd/kubeadm/app/constants/constants.go
View File

@ -323,7 +323,7 @@ const (
CoreDNSDeploymentName = "coredns" CoreDNSDeploymentName = "coredns"
// CoreDNSImageName specifies the name of the image for CoreDNS add-on // CoreDNSImageName specifies the name of the image for CoreDNS add-on
CoreDNSImageName = "coredns" CoreDNSImageName = "coredns/coredns"
// KubeDNSConfigMap specifies in what ConfigMap in the kube-system namespace the kube-dns config should be stored // KubeDNSConfigMap specifies in what ConfigMap in the kube-system namespace the kube-dns config should be stored
KubeDNSConfigMap = "kube-dns" KubeDNSConfigMap = "kube-dns"
@ -344,7 +344,7 @@ const (
KubeDNSVersion = "1.14.13" KubeDNSVersion = "1.14.13"
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used // CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.7.0" CoreDNSVersion = "v1.8.0"
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct // ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind = "ClusterConfiguration" ClusterConfigurationKind = "ClusterConfiguration"

6
cmd/kubeadm/app/phases/addons/dns/dns.go
View File

@ -369,7 +369,7 @@ func isCoreDNSConfigMapMigrationRequired(corefile, currentInstalledCoreDNSVersio
if corefile == "" || migration.Default("", corefile) { if corefile == "" || migration.Default("", corefile) {
return isMigrationRequired, nil return isMigrationRequired, nil
} }
deprecated, err := migration.Deprecated(currentInstalledCoreDNSVersion, kubeadmconstants.CoreDNSVersion, corefile) deprecated, err := migration.Deprecated(currentInstalledCoreDNSVersion, strings.TrimLeft(kubeadmconstants.CoreDNSVersion, "v"), corefile)
if err != nil { if err != nil {
return isMigrationRequired, errors.Wrap(err, "unable to get list of changes to the configuration.") return isMigrationRequired, errors.Wrap(err, "unable to get list of changes to the configuration.")
} }
@ -386,7 +386,7 @@ func isCoreDNSConfigMapMigrationRequired(corefile, currentInstalledCoreDNSVersio
func migrateCoreDNSCorefile(client clientset.Interface, cm *v1.ConfigMap, corefile, currentInstalledCoreDNSVersion string) error { func migrateCoreDNSCorefile(client clientset.Interface, cm *v1.ConfigMap, corefile, currentInstalledCoreDNSVersion string) error {
// Since the current configuration present is not the default version, try and migrate it. // Since the current configuration present is not the default version, try and migrate it.
updatedCorefile, err := migration.Migrate(currentInstalledCoreDNSVersion, kubeadmconstants.CoreDNSVersion, corefile, false) updatedCorefile, err := migration.Migrate(currentInstalledCoreDNSVersion, strings.TrimLeft(kubeadmconstants.CoreDNSVersion, "v"), corefile, false)
if err != nil { if err != nil {
return errors.Wrap(err, "unable to migrate CoreDNS ConfigMap") return errors.Wrap(err, "unable to migrate CoreDNS ConfigMap")
} }
@ -411,7 +411,7 @@ func migrateCoreDNSCorefile(client clientset.Interface, cm *v1.ConfigMap, corefi
} }
fmt.Println("[addons] Migrating CoreDNS Corefile") fmt.Println("[addons] Migrating CoreDNS Corefile")
changes, err := migration.Deprecated(currentInstalledCoreDNSVersion, kubeadmconstants.CoreDNSVersion, corefile) changes, err := migration.Deprecated(currentInstalledCoreDNSVersion, strings.TrimLeft(kubeadmconstants.CoreDNSVersion, "v"), corefile)
if err != nil { if err != nil {
return errors.Wrap(err, "unable to get list of changes to the configuration.") return errors.Wrap(err, "unable to get list of changes to the configuration.")
} }