WIP L3 NetLB experiment #2976
+177
−26
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package l3 | ||
|
|
||
| import ( | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/ingress-gce/pkg/flags" | ||
| ) | ||
|
|
||
| // ExperimentAnnotation is the key for enabling experimental L3 support for NetLB services. | ||
| // Note that the controller must have the flag for the experiment also enabled. | ||
| const ExperimentAnnotation = "networking.gke.io/l3-experiment" | ||
|
|
||
| // Wants determines if the service should use experimental L3 GCE resources. | ||
| // Controller must be run with experimental feature flag enabled for the annotation to take effect. | ||
| func Wants(svc *corev1.Service) bool { | ||
|
Contributor
There was a problem hiding this comment. Golint comments: exported function Wants should have comment or be unexported. More info. |
||
| if !flags.F.EnableL3NetLBOptIn { | ||
| return false | ||
| } | ||
|
|
||
| acceptableValues := map[string]struct{}{ | ||
| "true": {}, "enabled": {}, "enable": {}, | ||
| "on": {}, "yes": {}, "True": {}, | ||
| } | ||
|
|
||
| val, ok := svc.Annotations[ExperimentAnnotation] | ||
| if !ok { | ||
| return false | ||
| } | ||
| _, ok = acceptableValues[val] | ||
| return ok | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package l3_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/ingress-gce/pkg/flags" | ||
| "k8s.io/ingress-gce/pkg/loadbalancers/l3" | ||
| ) | ||
|
|
||
| func TestWants(t *testing.T) { | ||
| flagVal := flags.F.EnableL3NetLBOptIn | ||
| defer func() { | ||
| flags.F.EnableL3NetLBOptIn = flagVal | ||
| }() | ||
| testCases := []struct { | ||
| desc string | ||
| svc corev1.Service | ||
| want bool | ||
| }{ | ||
| { | ||
| desc: "empty", | ||
| svc: corev1.Service{}, | ||
| want: false, | ||
| }, | ||
| { | ||
| desc: "enabled", | ||
| svc: corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: map[string]string{ | ||
| "networking.gke.io/l3-experiment": "enabled", | ||
| }, | ||
| }, | ||
| }, | ||
| want: true, | ||
| }, | ||
| { | ||
| desc: "true", | ||
| svc: corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: map[string]string{ | ||
| "networking.gke.io/l3-experiment": "true", | ||
| }, | ||
| }, | ||
| }, | ||
| want: true, | ||
| }, | ||
| { | ||
| desc: "false", | ||
| svc: corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: map[string]string{ | ||
| "networking.gke.io/l3-experiment": "false", | ||
| }, | ||
| }, | ||
| }, | ||
| want: false, | ||
| }, | ||
| } | ||
| for _, tC := range testCases { | ||
| t.Run(tC.desc, func(t *testing.T) { | ||
| flags.F.EnableL3NetLBOptIn = true | ||
| got := l3.Wants(&tC.svc) | ||
| if got != tC.want { | ||
| t.Errorf("WantsL3NetLB(%+v) = %v, want %v", tC.svc, got, tC.want) | ||
| } | ||
| }) | ||
| t.Run(tC.desc+" flag disabled", func(t *testing.T) { | ||
| flags.F.EnableL3NetLBOptIn = false | ||
| got := l3.Wants(&tC.svc) | ||
| if got != false { | ||
| t.Errorf("WantsL3NetLB(%+v) = %v, want %v", tC.svc, got, false) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -38,6 +38,7 @@ import ( | |||||||
| "k8s.io/ingress-gce/pkg/forwardingrules" | ||||||||
| "k8s.io/ingress-gce/pkg/healthchecksl4" | ||||||||
| "k8s.io/ingress-gce/pkg/l4lb/metrics" | ||||||||
| "k8s.io/ingress-gce/pkg/loadbalancers/l3" | ||||||||
| "k8s.io/ingress-gce/pkg/network" | ||||||||
| "k8s.io/ingress-gce/pkg/utils" | ||||||||
| "k8s.io/ingress-gce/pkg/utils/namer" | ||||||||
|
|
@@ -353,11 +354,6 @@ func (l4netlb *L4NetLB) provideBackendService(syncResult *L4NetLBSyncResult, hcL | |||||||
| bsName := l4netlb.namer.L4Backend(l4netlb.Service.Namespace, l4netlb.Service.Name) | ||||||||
| servicePorts := l4netlb.Service.Spec.Ports | ||||||||
|
|
||||||||
| localityLbPolicy := l4netlb.determineBackendServiceLocalityPolicy() | ||||||||
|
|
||||||||
| connectionTrackingPolicy := l4netlb.connectionTrackingPolicy() | ||||||||
|
|
@@ -376,7 +372,7 @@ func (l4netlb *L4NetLB) provideBackendService(syncResult *L4NetLBSyncResult, hcL | |||||||
| backendParams := backends.L4BackendServiceParams{ | ||||||||
| Name: bsName, | ||||||||
| HealthCheckLink: hcLink, | ||||||||
| Protocol: l4netlb.backendProtocol(servicePorts), | ||||||||
| SessionAffinity: string(l4netlb.Service.Spec.SessionAffinity), | ||||||||
| Scheme: string(cloud.SchemeExternal), | ||||||||
| NamespacedName: l4netlb.NamespacedName, | ||||||||
|
|
@@ -405,6 +401,17 @@ func (l4netlb *L4NetLB) provideBackendService(syncResult *L4NetLBSyncResult, hcL | |||||||
| return bs.SelfLink | ||||||||
| } | ||||||||
|
|
||||||||
| func (l4netlb *L4NetLB) backendProtocol(servicePorts []corev1.ServicePort) string { | ||||||||
| switch { | ||||||||
| case l3.Wants(l4netlb.Service): | ||||||||
| return backends.ProtocolL3 | ||||||||
| case l4netlb.enableMixedProtocol: | ||||||||
| return backends.GetProtocol(servicePorts) | ||||||||
| default: | ||||||||
| return string(utils.GetProtocol(servicePorts)) | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| func (l4netlb *L4NetLB) ensureDualStackResources(result *L4NetLBSyncResult, nodeNames []string, bsLink string) { | ||||||||
| if utils.NeedsIPv4(l4netlb.Service) { | ||||||||
| l4netlb.ensureIPv4Resources(result, nodeNames, bsLink) | ||||||||
|
|
@@ -422,7 +429,7 @@ func (l4netlb *L4NetLB) ensureDualStackResources(result *L4NetLBSyncResult, node | |||||||
| // - IPv4 Forwarding Rule | ||||||||
| // - IPv4 Firewall | ||||||||
| func (l4netlb *L4NetLB) ensureIPv4Resources(result *L4NetLBSyncResult, nodeNames []string, bsLink string) { | ||||||||
| if !l3.Wants(l4netlb.Service) && l4netlb.enableMixedProtocol && forwardingrules.NeedsMixed(l4netlb.Service.Spec.Ports) { | ||||||||
| l4netlb.ensureIPv4MixedResources(result, nodeNames, bsLink) | ||||||||
| return | ||||||||
| } | ||||||||
|
|
@@ -436,11 +443,7 @@ func (l4netlb *L4NetLB) ensureIPv4Resources(result *L4NetLBSyncResult, nodeNames | |||||||
| result.MetricsLegacyState.IsUserError = IsUserError(err) | ||||||||
| return | ||||||||
| } | ||||||||
| result.Annotations[forwardingRuleAnnotationKey(fr)] = fr.Name | ||||||||
| result.MetricsLegacyState.IsManagedIP = ipAddrType == address.IPAddrManaged | ||||||||
| result.MetricsLegacyState.IsPremiumTier = fr.NetworkTier == cloud.NetworkTierPremium.ToGCEValue() | ||||||||
|
|
||||||||
|
|
@@ -453,6 +456,33 @@ func (l4netlb *L4NetLB) ensureIPv4Resources(result *L4NetLBSyncResult, nodeNames | |||||||
| result.Status = utils.AddIPToLBStatus(result.Status, fr.IPAddress) | ||||||||
| } | ||||||||
|
|
||||||||
| func forwardingRuleAnnotationKey(fr *composite.ForwardingRule) string { | ||||||||
| m := map[string]map[string]string{ | ||||||||
| "IPV4": { | ||||||||
| forwardingrules.ProtocolL3: annotations.L3ForwardingRuleKey, | ||||||||
| forwardingrules.ProtocolTCP: annotations.TCPForwardingRuleKey, | ||||||||
| forwardingrules.ProtocolUDP: annotations.UDPForwardingRuleKey, | ||||||||
| }, | ||||||||
| "IPV6": { | ||||||||
| forwardingrules.ProtocolL3: annotations.L3ForwardingRuleIPv6Key, | ||||||||
| forwardingrules.ProtocolTCP: annotations.TCPForwardingRuleIPv6Key, | ||||||||
| forwardingrules.ProtocolUDP: annotations.UDPForwardingRuleIPv6Key, | ||||||||
| }, | ||||||||
| } | ||||||||
|
|
||||||||
| version := fr.IpVersion | ||||||||
| if version == "" { | ||||||||
| version = "IPV4" | ||||||||
|
There was a problem hiding this comment. The hardcoded default version 'IPV4' should be defined as a constant to avoid magic strings and improve maintainability. |
||||||||
| } | ||||||||
|
|
||||||||
| protocol := fr.IPProtocol | ||||||||
| if protocol == "" { | ||||||||
| protocol = "UDP" | ||||||||
|
Comment on lines
+479
to
+480
There was a problem hiding this comment. The hardcoded default protocol 'UDP' should be defined as a constant or sourced from the same location as other protocol constants to maintain consistency and avoid magic strings.
Suggested change
|
||||||||
| } | ||||||||
|
|
||||||||
| return m[version][protocol] | ||||||||
| } | ||||||||
|
|
||||||||
| func (l4netlb *L4NetLB) ensureIPv4MixedResources(result *L4NetLBSyncResult, nodeNames []string, bsLink string) { | ||||||||
| res, err := l4netlb.mixedManager.EnsureIPv4(bsLink) | ||||||||
|
|
||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Golint comments: exported const ExperimentAnnotation should have comment or be unexported. More info.