github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Disable zones obtaining attempts for legacy vSphere cloud provider if secret provided and no CredentialsManager was set up.

Browse Source 
Partially solves #75175. Kubelet does not stucking on startup.
This commit is contained in:
Denis Moiseev 2021-04-06 19:50:33 +02:00 committed by Denis Moiseev
parent b960f7a0e0
commit e21385b9ba
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go
View File

@ -896,7 +896,12 @@ func (vs *VSphere) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
}
func (vs *VSphere) isZoneEnabled() bool {
return vs.cfg != nil && vs.cfg.Labels.Zone != "" && vs.cfg.Labels.Region != ""
isEnabled := vs.cfg != nil && vs.cfg.Labels.Zone != "" && vs.cfg.Labels.Region != ""
if isEnabled && vs.isSecretInfoProvided && vs.nodeManager.credentialManager == nil {
klog.V(1).Info("Zones can not be populated now due to credentials in Secret, skip.")
return false
}
return isEnabled
}
// Zones returns an implementation of Zones for vSphere.

62
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_test.go
View File

@ -463,6 +463,68 @@ func TestZonesNoConfig(t *testing.T) {
}
}
func TestZonesWithCredsInSecret(t *testing.T) {
noSecretCfg, err := readConfig(strings.NewReader(`
[Global]
user = "vsphere-creds"
password = "kube-system"
insecure-flag = "1"
[Workspace]
server = "vcenter.example.com"
datacenter = "LAB"
default-datastore = "datastore"
folder = "/LAB/vm/lab-gxjfk"
[VirtualCenter "vcenter.example.com"]
datacenters = "LAB"
[Labels]
region = "kube-region"
zone = "kube-zone"
`))
if err != nil {
t.Fatalf("Should succeed when a valid config is provided: %s", err)
}
vsphere, err := buildVSphereFromConfig(noSecretCfg)
if err != nil {
t.Fatalf("Should succeed when a valid config is provided: %s", err)
}
_, ok := vsphere.Zones()
if !ok {
t.Fatalf("Zones should return true with plain text credentials")
}
// Return false in case if secret provided but no informers (no NodeManager.credentialManager basically) set up.
// Such situation happens during kubelet startup process, when InitialNode creates.
// See https://github.com/kubernetes/kubernetes/issues/75175
// and https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/kubelet_node_status.go#L418
withSecretCfg, err := readConfig(strings.NewReader(`
[Global]
secret-name = "vsphere-creds"
secret-namespace = "kube-system"
insecure-flag = "1"
[Workspace]
server = "vcenter.example.com"
datacenter = "LAB"
default-datastore = "datastore_big"
folder = "/LAB/vm/lab-gxjfk"
[VirtualCenter "vcenter.example.com"]
datacenters = "LAB"
[Labels]
region = "kube-region"
zone = "kube-zone"
`))
if err != nil {
t.Fatalf("Should succeed when a valid config is provided: %s", err)
}
vsphere, err = buildVSphereFromConfig(withSecretCfg)
if err != nil {
t.Fatalf("Should succeed when a valid config is provided: %s", err)
}
_, ok = vsphere.Zones()
if ok {
t.Fatalf("Zones should return false with plain credentials in secret")
}
}
func TestZones(t *testing.T) {
// Any context will do
ctx := context.Background()