Add backend_type label to l4_netlbs_count and the L4_netlb latency metrics #2691
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
approved
mmamczur
force-pushed
the
ext_l4_lb_negs_metric
branch
from
6431825
to
9938c2b
Compare
|
/assign @swetharepakula |
| if err := common.EnsureServiceFinalizer(service, common.NetLBFinalizerV2, lc.ctx.KubeClient, svcLogger); err != nil { | ||
| finalizer := common.NetLBFinalizerV2 | ||
| if usesNegBackends { | ||
| finalizer = common.NetLBFinalizerV3 |
There was a problem hiding this comment.
This change would require us to update the old controller to verify that it detects it's an RBS if it has V3 finalizer:
https://github.com/kubernetes/cloud-provider-gcp/blob/master/providers/gce/gce_util.go#L409
There was a problem hiding this comment.
you are right, we should add it. IT shouldn't be a problem unless someone removes the rbs annotation so we should update CCM anyway
| @@ -94,7 +94,7 @@ func NewL4ILBSyncResult(syncType string, startTime time.Time, svc *corev1.Servic | |||
| StartTime: startTime, | |||
| SyncType: syncType, | |||
| // Internal Load Balancer doesn't support strong session affinity (passing `false` all along) | |||
| MetricsState: metrics.InitServiceMetricsState(svc, &startTime, isMultinetService, enabledStrongSessionAffinity, isWeightedLBPodsPerNode), | |||
| MetricsState: metrics.InitServiceMetricsState(svc, &startTime, isMultinetService, enabledStrongSessionAffinity, isWeightedLBPodsPerNode, metrics.L4BackendTypeNEG), | |||
There was a problem hiding this comment.
Consider creating a variable for metrics.L4BackendTypeNEG
There was a problem hiding this comment.
this a constant, I'd say we don't need a variable to hold it
pkg/utils/common/finalizer.go
Outdated
| updatedObjectMeta.Finalizers = slice.RemoveString(updatedObjectMeta.Finalizers, key, nil) | ||
| } | ||
|
|
||
| svcLogger.V(2).Info("Removing finalizers from service", "finalizerKeys", ensureRemoveKeys) |
There was a problem hiding this comment.
Replace ensureRemoveKeys with needToRemove
There was a problem hiding this comment.
Instead of having 2 for loops you can combine both in one:
| svcLogger.V(2).Info("Removing finalizers from service", "finalizerKeys", ensureRemoveKeys) | |
| updatedObjectMeta := service.ObjectMeta.DeepCopy() | |
| modified := false | |
| for _, key := range ensureRemoveKeys { | |
| if HasGivenFinalizer(service.ObjectMeta, key) { | |
| updatedObjectMeta.Finalizers = slice.RemoveString(updatedObjectMeta.Finalizers, key, nil) | |
| svcLogger.V(2).Info("Removing finalizer from service", "finalizerKey", key) | |
| modified = true | |
| } | |
| } | |
| if !modified { | |
| return nil | |
| } | |
| return patch.PatchServiceObjectMetadata(kubeClient.CoreV1(), service, *updatedObjectMeta) |
There was a problem hiding this comment.
this was actually part of the parent commit that was merged yesterday
…trics. This will be used to track number of LBs with NEG backends vs ones with IG backends.
mmamczur
force-pushed
the
ext_l4_lb_negs_metric
branch
from
9938c2b
to
2934115
Compare
k8s-ci-robot
added
size/M
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mmamczur, swetharepakula The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/unhold |
k8s-ci-robot
removed
the
do-not-merge/hold
This extends the L4 NetLB metrics with
backend_typefield that will allow tracking the adoption and performance of NEG backed LBs vs IG ones.