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

Merge pull request #96860 from pacoxu/fix/96833

Browse Source 
fix kube-dns federations check in kubeadm upgrade dns check preflight
This commit is contained in:
Kubernetes Prow Robot 2020-12-08 20:04:07 -08:00 committed by GitHub
commit 03aba080a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,17 +126,17 @@ func checkMigration(client clientset.Interface) error {
// checkKubeDNSConfigMap checks if the translation of kube-dns to CoreDNS ConfigMap is supported
func checkKubeDNSConfigMap(client clientset.Interface) error {
kubeDNSConfigMap, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(context.TODO(), kubeadmconstants.KubeDNSConfigMap, metav1.GetOptions{})
if err != nil && !apierrors.IsNotFound(err) {
if err != nil {
if apierrors.IsNotFound(err) {
return nil
}
return err
}
if kubeDNSConfigMap == nil {
return nil
}
if _, ok := kubeDNSConfigMap.Data["federations"]; ok {
klog.V(1).Infoln("CoreDNS no longer supports Federation and " +
"hence will not translate the federation data from kube-dns to CoreDNS ConfigMap")
return errors.Wrap(err, "kube-dns Federation data will not be translated")
return errors.New("kube-dns Federation data will not be translated")
}
return nil
}