From ffeb2323bd9c372fabebc6da6927f1503d4ae740 Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Thu, 9 Mar 2017 20:48:50 +0530 Subject: [PATCH] Avoid removing kube-dns configmap --- federation/pkg/kubefed/unjoin.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/federation/pkg/kubefed/unjoin.go b/federation/pkg/kubefed/unjoin.go index f9dcdcb6238..25d173be8c3 100644 --- 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{}) + return nil } + configMap.Data[util.FedDomainMapKey] = removeConfigMapString(configMap.Data[util.FedDomainMapKey], domainMap) - newFedMapValue := removeConfigMapString(configMap.Data[util.FedDomainMapKey], domainMap) - if newFedMapValue != "" { - configMap.Data[util.FedDomainMapKey] = newFedMapValue - _, err := clientset.Core().ConfigMaps(metav1.NamespaceSystem).Update(configMap) - return err - } - - 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