mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
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
This commit is contained in:
commit
3a722c1e8e
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user