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

Convert some emitted events to logs.

Browse Source
This commit is contained in:
Pavithra Ramesh 2021-08-13 14:31:20 -07:00
parent 894cb069dd
commit a21b977ad6
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go
View File

@ -55,14 +55,12 @@ func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v
if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) && existingFwdRule == nil { if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) && existingFwdRule == nil {
// When ILBSubsets is enabled, new ILB services will not be processed here. // 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. // Services that have existing GCE resources created by this controller will continue to update.
g.eventRecorder.Eventf(svc, v1.EventTypeNormal, "SkippingEnsureInternalLoadBalancer", klog.V(2).Infof("Skipped ensureInternalLoadBalancer for service %s/%s, since %s feature is enabled.", svc.Namespace, svc.Name, AlphaFeatureILBSubsets)
"Skipped ensureInternalLoadBalancer since %s feature is enabled.", AlphaFeatureILBSubsets)
return nil, cloudprovider.ImplementedElsewhere return nil, cloudprovider.ImplementedElsewhere
} }
if hasFinalizer(svc, ILBFinalizerV2) { if hasFinalizer(svc, ILBFinalizerV2) {
// Another controller is handling the resources for this service. // Another controller is handling the resources for this service.
g.eventRecorder.Eventf(svc, v1.EventTypeNormal, "SkippingEnsureInternalLoadBalancer", klog.V(2).Infof("Skipped ensureInternalLoadBalancer for service %s/%s, as service contains %q finalizer.", svc.Namespace, svc.Name, ILBFinalizerV2)
"Skipped ensureInternalLoadBalancer as service contains '%s' finalizer.", ILBFinalizerV2)
return nil, cloudprovider.ImplementedElsewhere 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. // and possibly the backend service need to be updated.
func (g *Cloud) updateInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, nodes []*v1.Node) error { func (g *Cloud) updateInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, nodes []*v1.Node) error {
if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) && !hasFinalizer(svc, ILBFinalizerV1) { if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) && !hasFinalizer(svc, ILBFinalizerV1) {
g.eventRecorder.Eventf(svc, v1.EventTypeNormal, "SkippingUpdateInternalLoadBalancer", klog.V(2).Infof("Skipped updateInternalLoadBalancer for service %s/%s since it does not contain %q finalizer.", svc.Namespace, svc.Name, ILBFinalizerV1)
"Skipped updateInternalLoadBalancer as service does not contain '%s' finalizer.", ILBFinalizerV1)
return cloudprovider.ImplementedElsewhere return cloudprovider.ImplementedElsewhere
} }
g.sharedResourceLock.Lock() g.sharedResourceLock.Lock()

9
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go
View File

@ -1060,9 +1060,6 @@ func TestEnsureInternalLoadBalancerSubsetting(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
status, err := createInternalLoadBalancer(gce, svc, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName) status, err := createInternalLoadBalancer(gce, svc, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName)
assert.EqualError(t, err, cloudprovider.ImplementedElsewhere.Error()) 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 // No loadbalancer resources will be created due to the ILB Feature Gate
assert.Empty(t, status) assert.Empty(t, status)
assertInternalLbResourcesDeleted(t, gce, svc, vals, true) assertInternalLbResourcesDeleted(t, gce, svc, vals, true)
@ -1664,8 +1661,6 @@ func TestEnsureLoadBalancerSkipped(t *testing.T) {
vals := DefaultTestClusterValues() vals := DefaultTestClusterValues()
gce, err := fakeGCECloud(vals) gce, err := fakeGCECloud(vals)
require.NoError(t, err) require.NoError(t, err)
recorder := record.NewFakeRecorder(1024)
gce.eventRecorder = recorder
nodeNames := []string{"test-node-1"} nodeNames := []string{"test-node-1"}
svc := fakeLoadbalancerService(string(LBTypeInternal)) svc := fakeLoadbalancerService(string(LBTypeInternal))
@ -1675,10 +1670,6 @@ func TestEnsureLoadBalancerSkipped(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
status, err := createInternalLoadBalancer(gce, svc, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName) status, err := createInternalLoadBalancer(gce, svc, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName)
assert.EqualError(t, err, cloudprovider.ImplementedElsewhere.Error()) 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 // No loadbalancer resources will be created due to the ILB Feature Gate
assert.Empty(t, status) assert.Empty(t, status)
assertInternalLbResourcesDeleted(t, gce, svc, vals, true) assertInternalLbResourcesDeleted(t, gce, svc, vals, true)