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

Merge pull request #86452 from lelenanam/lbbug

Browse Source 
Fix ensureStaticIP if name for existed address was changed
This commit is contained in:
Kubernetes Prow Robot 2019-12-29 10:15:38 -08:00 committed by GitHub
commit bd239d42e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_external.go
View File

@ -1060,6 +1060,18 @@ func ensureStaticIP(s CloudAddressService, name, serviceName, region, existingIP
existed = true existed = true
} }
// If address exists, get it by IP, because name might be different.
// This can specifically happen if the IP was changed from ephemeral to static,
// which results in a new name for the IP.
if existingIP != "" {
addr, err := s.GetRegionAddressByIP(region, existingIP)
if err != nil {
return "", false, fmt.Errorf("error getting static IP address: %v", err)
}
return addr.Address, existed, nil
}
// Otherwise, get address by name
addr, err := s.GetRegionAddress(name, region) addr, err := s.GetRegionAddress(name, region)
if err != nil { if err != nil {
return "", false, fmt.Errorf("error getting static IP address: %v", err) return "", false, fmt.Errorf("error getting static IP address: %v", err)

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

@ -63,6 +63,13 @@ func TestEnsureStaticIP(t *testing.T) {
if err != nil || !existed || ip != ipPrime { if err != nil || !existed || ip != ipPrime {
t.Fatalf(`ensureStaticIP(%v, %v, %v, %v, %v) = %v, %v, %v; want %v, true, nil`, gce, ipName, serviceName, gce.region, ip, ipPrime, existed, err, ip) t.Fatalf(`ensureStaticIP(%v, %v, %v, %v, %v) = %v, %v, %v; want %v, true, nil`, gce, ipName, serviceName, gce.region, ip, ipPrime, existed, err, ip)
} }
// Ensure call with different name
ipName = "another-name-for-static-ip"
ipPrime, existed, err = ensureStaticIP(gce, ipName, serviceName, gce.region, ip, cloud.NetworkTierDefault)
if err != nil || !existed || ip != ipPrime {
t.Fatalf(`ensureStaticIP(%v, %v, %v, %v, %v) = %v, %v, %v; want %v, true, nil`, gce, ipName, serviceName, gce.region, ip, ipPrime, existed, err, ip)
}
} }
func TestEnsureStaticIPWithTier(t *testing.T) { func TestEnsureStaticIPWithTier(t *testing.T) {