mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
add gce elb rbs opt-in annotation
This commit is contained in:
parent
aff056d8a1
commit
6ba8c86fc3
@ -74,6 +74,13 @@ const (
|
|||||||
|
|
||||||
// NetworkTierAnnotationPremium is an annotation to indicate the Service is on the Premium network tier
|
// NetworkTierAnnotationPremium is an annotation to indicate the Service is on the Premium network tier
|
||||||
NetworkTierAnnotationPremium = cloud.NetworkTierPremium
|
NetworkTierAnnotationPremium = cloud.NetworkTierPremium
|
||||||
|
|
||||||
|
// RBSAnnotationKey is annotated on a Service object to indicate
|
||||||
|
// opt-in mode for RBS NetLB
|
||||||
|
RBSAnnotationKey = "cloud.google.com/l4-rbs"
|
||||||
|
|
||||||
|
// RBSEnabled is an annotation to indicate the Service is opt-in for RBS
|
||||||
|
RBSEnabled = "enabled"
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetLoadBalancerAnnotationType returns the type of GCP load balancer which should be assembled.
|
// GetLoadBalancerAnnotationType returns the type of GCP load balancer which should be assembled.
|
||||||
|
@ -31,6 +31,7 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
|
cloudprovider "k8s.io/cloud-provider"
|
||||||
servicehelpers "k8s.io/cloud-provider/service/helpers"
|
servicehelpers "k8s.io/cloud-provider/service/helpers"
|
||||||
utilnet "k8s.io/utils/net"
|
utilnet "k8s.io/utils/net"
|
||||||
|
|
||||||
@ -51,6 +52,11 @@ const (
|
|||||||
// new load balancers and updating existing load balancers, recognizing when
|
// new load balancers and updating existing load balancers, recognizing when
|
||||||
// each is needed.
|
// each is needed.
|
||||||
func (g *Cloud) ensureExternalLoadBalancer(clusterName string, clusterID string, apiService *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
|
func (g *Cloud) ensureExternalLoadBalancer(clusterName string, clusterID string, apiService *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
|
||||||
|
// Skip service handling if managed by ingress-gce using Regional Backend Services
|
||||||
|
if val, ok := apiService.Annotations[RBSAnnotationKey]; ok && val == RBSEnabled {
|
||||||
|
return nil, cloudprovider.ImplementedElsewhere
|
||||||
|
}
|
||||||
|
|
||||||
if len(nodes) == 0 {
|
if len(nodes) == 0 {
|
||||||
return nil, fmt.Errorf(errStrLbNoHosts)
|
return nil, fmt.Errorf(errStrLbNoHosts)
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,6 @@ package gce
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
@ -30,6 +29,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
compute "google.golang.org/api/compute/v1"
|
compute "google.golang.org/api/compute/v1"
|
||||||
|
cloudprovider "k8s.io/cloud-provider"
|
||||||
|
|
||||||
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
|
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
|
||||||
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
|
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
|
||||||
@ -580,6 +580,48 @@ func TestEnsureExternalLoadBalancerFailsWithNoNodes(t *testing.T) {
|
|||||||
assert.EqualError(t, err, errStrLbNoHosts)
|
assert.EqualError(t, err, errStrLbNoHosts)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEnsureExternalLoadBalancerRBSAnnotation(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
vals := DefaultTestClusterValues()
|
||||||
|
gce, err := fakeGCECloud(DefaultTestClusterValues())
|
||||||
|
require.NoError(t, err)
|
||||||
|
nodeNames := []string{"test-node-1"}
|
||||||
|
|
||||||
|
nodes, err := createAndInsertNodes(gce, nodeNames, vals.ZoneName)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
svc := fakeLoadbalancerService("")
|
||||||
|
|
||||||
|
for desc, tc := range map[string]struct {
|
||||||
|
annotations map[string]string
|
||||||
|
expectError *error
|
||||||
|
}{
|
||||||
|
"When RBS enabled": {
|
||||||
|
annotations: map[string]string{RBSAnnotationKey: RBSEnabled},
|
||||||
|
expectError: &cloudprovider.ImplementedElsewhere,
|
||||||
|
},
|
||||||
|
"When RBS not enabled": {
|
||||||
|
annotations: map[string]string{},
|
||||||
|
expectError: nil,
|
||||||
|
},
|
||||||
|
"When RBS annotation has wrong value": {
|
||||||
|
annotations: map[string]string{RBSAnnotationKey: "WrongValue"},
|
||||||
|
expectError: nil,
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
t.Run(desc, func(t *testing.T) {
|
||||||
|
svc.Annotations = tc.annotations
|
||||||
|
_, err = gce.ensureExternalLoadBalancer(vals.ClusterName, vals.ClusterID, svc, nil, nodes)
|
||||||
|
if tc.expectError != nil {
|
||||||
|
assert.EqualError(t, err, (*tc.expectError).Error())
|
||||||
|
} else {
|
||||||
|
assert.NoError(t, err, "Should not return an error "+desc)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestForwardingRuleNeedsUpdate(t *testing.T) {
|
func TestForwardingRuleNeedsUpdate(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user