Merge pull request #42838 from shashidharatd/kubefed-2

Automatic merge from submit-queue [Federation] Fix removing kube-dns configmap during cluster unjoin Fixes: #42836 cc @madhusudancs @kubernetes/sig-federation-bugs

Merge pull request #42838 from shashidharatd/kubefed-2
3a722c1e · Kubernetes Submit Queue · GitHub · c38717b7 · ffeb2323 · 3a722c1e
Commit 3a722c1e authored Mar 10, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 9 deletions

unjoin.go federation/pkg/kubefed/unjoin.go +5 -9

No files found.
--- a/federation/pkg/kubefed/unjoin.go
+++ b/federation/pkg/kubefed/unjoin.go
@@ -181,18 +181,14 @@ func deleteConfigMapFromCluster(hostClientset internalclientset.Interface, secre
 	if err != nil {
 		return err
 	}
-	if _, ok := configMap.Data[util.FedDomainMapKey]; !ok {
-		return clientset.Core().ConfigMaps(metav1.NamespaceSystem).Delete(util.KubeDnsConfigmapName, &metav1.DeleteOptions{})
-	}

-	newFedMapValue := removeConfigMapString(configMap.Data[util.FedDomainMapKey], domainMap)
-	if newFedMapValue != "" {
-		configMap.Data[util.FedDomainMapKey] = newFedMapValue
-		_, err := clientset.Core().ConfigMaps(metav1.NamespaceSystem).Update(configMap)
-		return err
+	if _, ok := configMap.Data[util.FedDomainMapKey]; !ok {
+		return nil
 	}
+	configMap.Data[util.FedDomainMapKey] = removeConfigMapString(configMap.Data[util.FedDomainMapKey], domainMap)

-	return clientset.Core().ConfigMaps(metav1.NamespaceSystem).Delete(util.KubeDnsConfigmapName, &metav1.DeleteOptions{})
+	_, err = clientset.Core().ConfigMaps(metav1.NamespaceSystem).Update(configMap)
+	return err
 }

 // deleteSecret deletes the secret with the given name from the host