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

Merge pull request #42838 from shashidharatd/kubefed-2

Browse Source 
Automatic merge from submit-queue

[Federation] Fix removing kube-dns configmap during cluster unjoin

Fixes: #42836 

cc @madhusudancs @kubernetes/sig-federation-bugs
This commit is contained in:
Kubernetes Submit Queue 2017-03-10 04:42:04 -08:00 committed by GitHub
commit 3a722c1e8e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
federation/pkg/kubefed/unjoin.go
View File

@ -181,20 +181,16 @@ func deleteConfigMapFromCluster(hostClientset internalclientset.Interface, secre
if err != nil { if err != nil {
return err return err
} }
if _, ok := configMap.Data[util.FedDomainMapKey]; !ok { 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) _, err = clientset.Core().ConfigMaps(metav1.NamespaceSystem).Update(configMap)
if newFedMapValue != "" {
configMap.Data[util.FedDomainMapKey] = newFedMapValue
_, err := clientset.Core().ConfigMaps(metav1.NamespaceSystem).Update(configMap)
return err return err
} }
return clientset.Core().ConfigMaps(metav1.NamespaceSystem).Delete(util.KubeDnsConfigmapName, &metav1.DeleteOptions{})
}
// deleteSecret deletes the secret with the given name from the host // deleteSecret deletes the secret with the given name from the host
// cluster. // cluster.
func deleteSecret(clientset internalclientset.Interface, name, namespace string) error { func deleteSecret(clientset internalclientset.Interface, name, namespace string) error {