github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

only delete forwardingrule and address when net tier annotation is specified

Browse Source
This commit is contained in:
Minhan Xia 2021-06-01 17:46:32 -07:00
parent fb3273774a
commit fbf2d2df26
2 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,12 @@ func (g *Cloud) ensureExternalLoadBalancer(clusterName string, clusterID string,
return nil, err
}
klog.V(4).Infof("ensureExternalLoadBalancer(%s): Desired network tier %q.", lbRefStr, netTier)
// TODO: distinguish between unspecified and specified network tiers annotation properly in forwardingrule creation
// Only delete ForwardingRule when network tier annotation is specified, otherwise leave it only to avoid wrongful
// deletion against user intention when network tier annotation is not specified.
if _, ok := apiService.Annotations[NetworkTierAnnotationKey]; ok {
g.deleteWrongNetworkTieredResources(loadBalancerName, lbRefStr, netTier)
}
// Check if the forwarding rule exists, and if so, what its IP is.
fwdRuleExists, fwdRuleNeedsUpdate, fwdRuleIP, err := g.forwardingRuleNeedsUpdate(loadBalancerName, g.region, requestedIP, ports)

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

@ -304,6 +304,86 @@ func createExternalLoadBalancer(gce *Cloud, svc *v1.Service, nodeNames []string,
)
}
func TestShouldNotRecreateLBWhenNetworkTiersMismatch(t *testing.T) {
t.Parallel()
vals := DefaultTestClusterValues()
nodeNames := []string{"test-node-1"}
gce, err := fakeGCECloud(vals)
require.NoError(t, err)
svc := fakeLoadbalancerService("")
nodes, err := createAndInsertNodes(gce, nodeNames, vals.ZoneName)
require.NoError(t, err)
staticIP := "1.2.3.4"
gce.ReserveRegionAddress(&compute.Address{Address: staticIP, Name: "foo", NetworkTier: cloud.NetworkTierStandard.ToGCEValue()}, vals.Region)
for _, tc := range []struct {
desc string
mutateSvc func(service *v1.Service)
expectNetTier string
expectError bool
}{
{
desc: "initial LB config with standard network tier annotation",
mutateSvc: func(service *v1.Service) {
svc.Annotations[NetworkTierAnnotationKey] = string(NetworkTierAnnotationStandard)
},
expectNetTier: NetworkTierAnnotationStandard.ToGCEValue(),
},
{
desc: "svc changed to empty network tier annotation",
mutateSvc: func(service *v1.Service) {
svc.Annotations = make(map[string]string)
},
expectNetTier: NetworkTierAnnotationStandard.ToGCEValue(),
},
{
desc: "network tier annotation changed to premium",
mutateSvc: func(service *v1.Service) {
svc.Annotations[NetworkTierAnnotationKey] = string(NetworkTierAnnotationPremium)
},
expectNetTier: NetworkTierAnnotationPremium.ToGCEValue(),
},
{
desc: " Network tiers annotation set to Standard and reserved static IP is specified",
mutateSvc: func(service *v1.Service) {
svc.Annotations[NetworkTierAnnotationKey] = string(NetworkTierAnnotationStandard)
svc.Spec.LoadBalancerIP = staticIP
},
expectNetTier: NetworkTierAnnotationStandard.ToGCEValue(),
},
{
desc: "svc changed to empty network tier annotation with static ip",
mutateSvc: func(service *v1.Service) {
svc.Annotations = make(map[string]string)
},
expectNetTier: NetworkTierAnnotationStandard.ToGCEValue(),
expectError: true,
},
} {
tc.mutateSvc(svc)
status, err := gce.ensureExternalLoadBalancer(vals.ClusterName, vals.ClusterID, svc, nil, nodes)
if tc.expectError {
if err == nil {
t.Errorf("for test case %q, expect errror != nil, but got %v", tc.desc, err)
}
} else {
assert.NoError(t, err)
assert.NotEmpty(t, status.Ingress)
}
lbName := gce.GetLoadBalancerName(context.TODO(), "", svc)
fwdRule, err := gce.GetRegionForwardingRule(lbName, gce.region)
assert.NoError(t, err)
if fwdRule.NetworkTier != tc.expectNetTier {
t.Fatalf("for test case %q, expect fwdRule.NetworkTier == %q, got %v ", tc.desc, tc.expectNetTier, fwdRule.NetworkTier)
}
assertExternalLbResources(t, gce, svc, vals, nodeNames)
}
}
func TestEnsureExternalLoadBalancer(t *testing.T) {
t.Parallel()