mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #79356 from prameshj/revert-78463-ilb-annotate
Revert "Skip ILB creation on GCE if neg annotation is present"
This commit is contained in:
commit
bc1360ab15
@ -58,9 +58,6 @@ const (
|
||||
|
||||
// NetworkTierAnnotationPremium is an annotation to indicate the Service is on the Premium network tier
|
||||
NetworkTierAnnotationPremium = cloud.NetworkTierPremium
|
||||
|
||||
// NEGAnnotation is an annotation to indicate that the loadbalancer service is using NEGs instead of InstanceGroups
|
||||
NEGAnnotation = "cloud.google.com/neg"
|
||||
)
|
||||
|
||||
// GetLoadBalancerAnnotationType returns the type of GCP load balancer which should be assembled.
|
||||
|
@ -35,16 +35,7 @@ const (
|
||||
allInstances = "ALL"
|
||||
)
|
||||
|
||||
func usesNEG(service *v1.Service) bool {
|
||||
_, ok := service.GetAnnotations()[NEGAnnotation]
|
||||
return ok
|
||||
}
|
||||
|
||||
func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
|
||||
if usesNEG(svc) {
|
||||
// Do not manage loadBalancer for services using NEGs
|
||||
return &svc.Status.LoadBalancer, nil
|
||||
}
|
||||
nm := types.NamespacedName{Name: svc.Name, Namespace: svc.Namespace}
|
||||
ports, protocol := getPortsAndProtocol(svc.Spec.Ports)
|
||||
if protocol != v1.ProtocolTCP && protocol != v1.ProtocolUDP {
|
||||
@ -210,10 +201,6 @@ func (g *Cloud) clearPreviousInternalResources(svc *v1.Service, loadBalancerName
|
||||
// updateInternalLoadBalancer is called when the list of nodes has changed. Therefore, only the instance groups
|
||||
// and possibly the backend service need to be updated.
|
||||
func (g *Cloud) updateInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, nodes []*v1.Node) error {
|
||||
if usesNEG(svc) {
|
||||
// Do not manage loadBalancer for services using NEGs
|
||||
return nil
|
||||
}
|
||||
g.sharedResourceLock.Lock()
|
||||
defer g.sharedResourceLock.Unlock()
|
||||
|
||||
|
@ -847,62 +847,3 @@ func TestCompareHealthChecks(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureInternalLoadBalancerNEG(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
vals := DefaultTestClusterValues()
|
||||
gce, err := fakeGCECloud(vals)
|
||||
require.NoError(t, err)
|
||||
|
||||
nodeNames := []string{"test-node-1"}
|
||||
nodes, err := createAndInsertNodes(gce, nodeNames, vals.ZoneName)
|
||||
require.NoError(t, err)
|
||||
|
||||
apiService := fakeLoadbalancerServiceWithNEGs(string(LBTypeInternal))
|
||||
status, err := gce.EnsureLoadBalancer(context.Background(), vals.ClusterName, apiService, nodes)
|
||||
assert.NoError(t, err)
|
||||
// No loadbalancer resources will be created due to the NEG annotation
|
||||
assert.Empty(t, status.Ingress)
|
||||
assertInternalLbResourcesDeleted(t, gce, apiService, vals, true)
|
||||
// Invoking delete should be a no-op
|
||||
err = gce.EnsureLoadBalancerDeleted(context.Background(), vals.ClusterName, apiService)
|
||||
assert.NoError(t, err)
|
||||
// Now remove the annotation so that lb resources are created
|
||||
delete(apiService.Annotations, NEGAnnotation)
|
||||
status, err = gce.EnsureLoadBalancer(context.Background(), vals.ClusterName, apiService, nodes)
|
||||
assert.NoError(t, err)
|
||||
assert.NotEmpty(t, status.Ingress)
|
||||
assertInternalLbResources(t, gce, apiService, vals, nodeNames)
|
||||
}
|
||||
|
||||
func TestEnsureInternalLoadBalancerDeletedNEGs(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
vals := DefaultTestClusterValues()
|
||||
gce, err := fakeGCECloud(vals)
|
||||
require.NoError(t, err)
|
||||
|
||||
nodeNames := []string{"test-node-1"}
|
||||
nodes, err := createAndInsertNodes(gce, nodeNames, vals.ZoneName)
|
||||
require.NoError(t, err)
|
||||
|
||||
apiService := fakeLoadbalancerService(string(LBTypeInternal))
|
||||
|
||||
status, err := gce.EnsureLoadBalancer(context.Background(), vals.ClusterName, apiService, nodes)
|
||||
assert.NoError(t, err)
|
||||
assert.NotEmpty(t, status.Ingress)
|
||||
// Annotation gets added to service
|
||||
apiService.Annotations[NEGAnnotation] = "{\"ilb\": true}"
|
||||
newLBStatus := v1.LoadBalancerStatus{Ingress: []v1.LoadBalancerIngress{{IP: "1.2.3.4"}}}
|
||||
// mock scenario where a different controller modifies status.
|
||||
apiService.Status.LoadBalancer = newLBStatus
|
||||
status, err = gce.EnsureLoadBalancer(context.Background(), vals.ClusterName, apiService, nodes)
|
||||
assert.NoError(t, err)
|
||||
// ensure that the status info is intact
|
||||
assert.Equal(t, status, &newLBStatus)
|
||||
// Invoked when service is deleted.
|
||||
err = gce.EnsureLoadBalancerDeleted(context.Background(), vals.ClusterName, apiService)
|
||||
assert.NoError(t, err)
|
||||
assertInternalLbResourcesDeleted(t, gce, apiService, vals, true)
|
||||
}
|
||||
|
@ -62,12 +62,6 @@ func fakeLoadbalancerService(lbType string) *v1.Service {
|
||||
}
|
||||
}
|
||||
|
||||
func fakeLoadbalancerServiceWithNEGs(lbType string) *v1.Service {
|
||||
svc := fakeLoadbalancerService(lbType)
|
||||
svc.Annotations[NEGAnnotation] = "{\"ilb\": true}"
|
||||
return svc
|
||||
}
|
||||
|
||||
var (
|
||||
FilewallChangeMsg = fmt.Sprintf("%s %s %s", v1.EventTypeNormal, eventReasonManualChange, eventMsgFirewallChange)
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user