mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Revert "certs: only append locally discovered addresses when we got none from the cloudprovider"
This reverts commit 7354bbe5ac
.
This commit is contained in:
parent
a6e351484e
commit
f1adf74b4e
@ -750,28 +750,20 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
|
|||||||
klet.statusManager = status.NewManager(klet.kubeClient, klet.podManager, klet)
|
klet.statusManager = status.NewManager(klet.kubeClient, klet.podManager, klet)
|
||||||
|
|
||||||
if kubeCfg.ServerTLSBootstrap && kubeDeps.TLSOptions != nil && utilfeature.DefaultFeatureGate.Enabled(features.RotateKubeletServerCertificate) {
|
if kubeCfg.ServerTLSBootstrap && kubeDeps.TLSOptions != nil && utilfeature.DefaultFeatureGate.Enabled(features.RotateKubeletServerCertificate) {
|
||||||
var (
|
var ips []net.IP
|
||||||
ips []net.IP
|
cfgAddress := net.ParseIP(kubeCfg.Address)
|
||||||
names []string
|
if cfgAddress == nil || cfgAddress.IsUnspecified() {
|
||||||
)
|
|
||||||
|
|
||||||
// If the address was explicitly configured, use that. Otherwise, try to
|
|
||||||
// discover addresses from the cloudprovider. Otherwise, make a best guess.
|
|
||||||
if cfgAddress := net.ParseIP(kubeCfg.Address); cfgAddress != nil && !cfgAddress.IsUnspecified() {
|
|
||||||
ips = []net.IP{cfgAddress}
|
|
||||||
names = []string{klet.GetHostname(), hostnameOverride}
|
|
||||||
} else if len(cloudIPs) != 0 || len(cloudNames) != 0 {
|
|
||||||
ips = cloudIPs
|
|
||||||
names = cloudNames
|
|
||||||
} else {
|
|
||||||
localIPs, err := allGlobalUnicastIPs()
|
localIPs, err := allGlobalUnicastIPs()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
ips = localIPs
|
ips = localIPs
|
||||||
names = []string{klet.GetHostname(), hostnameOverride}
|
} else {
|
||||||
|
ips = []net.IP{cfgAddress}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ips = append(ips, cloudIPs...)
|
||||||
|
names := append([]string{klet.GetHostname(), hostnameOverride}, cloudNames...)
|
||||||
klet.serverCertificateManager, err = kubeletcertificate.NewKubeletServerCertificateManager(klet.kubeClient, kubeCfg, klet.nodeName, ips, names, certDirectory)
|
klet.serverCertificateManager, err = kubeletcertificate.NewKubeletServerCertificateManager(klet.kubeClient, kubeCfg, klet.nodeName, ips, names, certDirectory)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to initialize certificate manager: %v", err)
|
return nil, fmt.Errorf("failed to initialize certificate manager: %v", err)
|
||||||
|
Loading…
Reference in New Issue
Block a user