diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go index e084a8f1f7b..0cfc832ad33 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go @@ -55,14 +55,12 @@ func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) && existingFwdRule == nil { // When ILBSubsets is enabled, new ILB services will not be processed here. // Services that have existing GCE resources created by this controller will continue to update. - g.eventRecorder.Eventf(svc, v1.EventTypeNormal, "SkippingEnsureInternalLoadBalancer", - "Skipped ensureInternalLoadBalancer since %s feature is enabled.", AlphaFeatureILBSubsets) + klog.V(2).Infof("Skipped ensureInternalLoadBalancer for service %s/%s, since %s feature is enabled.", svc.Namespace, svc.Name, AlphaFeatureILBSubsets) return nil, cloudprovider.ImplementedElsewhere } if hasFinalizer(svc, ILBFinalizerV2) { // Another controller is handling the resources for this service. - g.eventRecorder.Eventf(svc, v1.EventTypeNormal, "SkippingEnsureInternalLoadBalancer", - "Skipped ensureInternalLoadBalancer as service contains '%s' finalizer.", ILBFinalizerV2) + klog.V(2).Infof("Skipped ensureInternalLoadBalancer for service %s/%s, as service contains %q finalizer.", svc.Namespace, svc.Name, ILBFinalizerV2) return nil, cloudprovider.ImplementedElsewhere } @@ -275,8 +273,7 @@ func (g *Cloud) clearPreviousInternalResources(svc *v1.Service, loadBalancerName // and possibly the backend service need to be updated. func (g *Cloud) updateInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, nodes []*v1.Node) error { if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) && !hasFinalizer(svc, ILBFinalizerV1) { - g.eventRecorder.Eventf(svc, v1.EventTypeNormal, "SkippingUpdateInternalLoadBalancer", - "Skipped updateInternalLoadBalancer as service does not contain '%s' finalizer.", ILBFinalizerV1) + klog.V(2).Infof("Skipped updateInternalLoadBalancer for service %s/%s since it does not contain %q finalizer.", svc.Namespace, svc.Name, ILBFinalizerV1) return cloudprovider.ImplementedElsewhere } g.sharedResourceLock.Lock() diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go index 4744ff60dac..c54a186938a 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go @@ -1060,9 +1060,6 @@ func TestEnsureInternalLoadBalancerSubsetting(t *testing.T) { require.NoError(t, err) status, err := createInternalLoadBalancer(gce, svc, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName) assert.EqualError(t, err, cloudprovider.ImplementedElsewhere.Error()) - expectedEvent := fmt.Sprintf("Normal SkippingEnsureInternalLoadBalancer Skipped ensureInternalLoadBalancer"+ - " since %s feature is enabled.", AlphaFeatureILBSubsets) - checkEvent(t, recorder, expectedEvent, true) // No loadbalancer resources will be created due to the ILB Feature Gate assert.Empty(t, status) assertInternalLbResourcesDeleted(t, gce, svc, vals, true) @@ -1664,8 +1661,6 @@ func TestEnsureLoadBalancerSkipped(t *testing.T) { vals := DefaultTestClusterValues() gce, err := fakeGCECloud(vals) require.NoError(t, err) - recorder := record.NewFakeRecorder(1024) - gce.eventRecorder = recorder nodeNames := []string{"test-node-1"} svc := fakeLoadbalancerService(string(LBTypeInternal)) @@ -1675,10 +1670,6 @@ func TestEnsureLoadBalancerSkipped(t *testing.T) { require.NoError(t, err) status, err := createInternalLoadBalancer(gce, svc, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName) assert.EqualError(t, err, cloudprovider.ImplementedElsewhere.Error()) - expectedEvent := fmt.Sprintf("Normal SkippingEnsureInternalLoadBalancer Skipped ensureInternalLoadBalancer"+ - " as service contains '%s' finalizer", - ILBFinalizerV2) - checkEvent(t, recorder, expectedEvent, true) // No loadbalancer resources will be created due to the ILB Feature Gate assert.Empty(t, status) assertInternalLbResourcesDeleted(t, gce, svc, vals, true)