mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Avoid removing kube-dns configmap
This commit is contained in:
parent
7b4bec038c
commit
ffeb2323bd
@ -181,18 +181,14 @@ 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 != "" {
|
return err
|
||||||
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{})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// deleteSecret deletes the secret with the given name from the host
|
// deleteSecret deletes the secret with the given name from the host
|
||||||
|
Loading…
Reference in New Issue
Block a user