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

Avoid removing kube-dns configmap

Browse Source
This commit is contained in:
shashidharatd 2017-03-09 20:48:50 +05:30
parent 7b4bec038c
commit ffeb2323bd
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 {