opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-31 01:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1004 from yousong/feature/yousong-lb-send-proxy

Browse Source 
lb: 添加PROXY协议支持
This commit is contained in:
yunion-ci-robot
2019-05-31 12:31:19 +08:00
committed by GitHub
parent fd048e983e d3f4518967
commit 679fc594ae
8 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/loadbalancer_const.go
+16
View File
@@ -267,6 +267,22 @@ var LB_SCHEDULER_TYPES = choices.NewChoices(
LB_SCHEDULER_TCH,
)
const (
LB_SENDPROXY_OFF = "off"
LB_SENDPROXY_V1 = "v1"
LB_SENDPROXY_V2 = "v2"
LB_SENDPROXY_V2_SSL = "v2-ssl"
LB_SENDPROXY_V2_SSL_CN = "v2-ssl-cn"
)
var LB_SENDPROXY_CHOICES = choices.NewChoices(
LB_SENDPROXY_OFF,
LB_SENDPROXY_V1,
LB_SENDPROXY_V2,
LB_SENDPROXY_V2_SSL,
LB_SENDPROXY_V2_SSL_CN,
)
var LB_ALIYUN_UDP_SCHEDULER_TYPES = choices.NewChoices(
LB_SCHEDULER_RR,
LB_SCHEDULER_WRR,
pkg/compute/models/loadbalancerbackends.go
+6 -2
View File
@@ -64,6 +64,8 @@ type SLoadbalancerBackend struct {
Weight int `width:"36" charset:"ascii" nullable:"false" list:"user" create:"optional" update:"user"`
Address string `width:"36" charset:"ascii" nullable:"false" list:"user" create:"optional"`
Port int `nullable:"false" list:"user" create:"required" update:"user"`
SendProxy string `width:"16" charset:"ascii" nullable:"false" list:"user" create:"optional" update:"user" default:"off"`
}
func (man *SLoadbalancerBackendManager) pendingDeleteSubs(ctx context.Context, userCred mcclient.TokenCredential, q *sqlchemy.SQuery) {
@@ -144,6 +146,7 @@ func (man *SLoadbalancerBackendManager) ValidateCreateData(ctx context.Context,
"backend_type": backendTypeV,
"weight": validators.NewRangeValidator("weight", 1, 256).Default(1),
"port": validators.NewPortValidator("port"),
"send_proxy": validators.NewStringChoicesValidator("send_proxy", api.LB_SENDPROXY_CHOICES).Default(api.LB_SENDPROXY_OFF),
}
for _, v := range keyV {
if err := v.Validate(data); err != nil {
@@ -274,8 +277,9 @@ func (man *SLoadbalancerBackendManager) GetGuestAddress(guest *SGuest) (string,
func (lbb *SLoadbalancerBackend) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
keyV := map[string]validators.IValidator{
"weight": validators.NewRangeValidator("weight", 1, 256),
"port": validators.NewPortValidator("port"),
"weight": validators.NewRangeValidator("weight", 1, 256),
"port": validators.NewPortValidator("port"),
"send_proxy": validators.NewStringChoicesValidator("send_proxy", api.LB_SENDPROXY_CHOICES),
}
for _, v := range keyV {
v.Optional(true)
pkg/compute/models/loadbalancerlisteners.go
+6
View File
@@ -118,6 +118,8 @@ type SLoadbalancerListener struct {
Scheduler string `width:"16" charset:"ascii" nullable:"false" list:"user" create:"required" update:"user"`
SendProxy string `width:"16" charset:"ascii" nullable:"false" list:"user" create:"optional" update:"user" default:"off"`
ClientRequestTimeout int `nullable:"false" list:"user" create:"optional" update:"user"`
ClientIdleTimeout int `nullable:"false" list:"user" create:"optional" update:"user"`
BackendConnectTimeout int `nullable:"false" list:"user" create:"optional" update:"user"`
@@ -204,6 +206,8 @@ func (man *SLoadbalancerListenerManager) ValidateCreateData(ctx context.Context,
"listener_port": listenerPortV,
"backend_group": backendGroupV.Optional(true),
"send_proxy": validators.NewStringChoicesValidator("send_proxy", api.LB_SENDPROXY_CHOICES).Default(api.LB_SENDPROXY_OFF),
"acl_status": aclStatusV.Default(api.LB_BOOL_OFF),
"acl_type": aclTypeV.Optional(true),
"acl": aclV.Optional(true),
@@ -420,6 +424,8 @@ func (lblis *SLoadbalancerListener) ValidateUpdateData(ctx context.Context, user
keyV := map[string]validators.IValidator{
"backend_group": backendGroupV,
"send_proxy": validators.NewStringChoicesValidator("send_proxy", api.LB_SENDPROXY_CHOICES),
"acl_status": aclStatusV,
"acl_type": aclTypeV,
"acl": aclV,
pkg/lbagent/models/haproxy.go
+13
View File
@@ -289,6 +289,10 @@ func (b *LoadbalancerCorpus) genHaproxyConfigBackend(data map[string]interface{}
}
}
{
listenerSendProxy, err := agentutils.HaproxySendProxy(listener.SendProxy)
if err != nil {
return fmt.Errorf("listener %s(%s): %v", listener.Name, listener.Id, err)
}
serverLines := []string{}
for _, backend := range backendGroup.backends {
serverLine := fmt.Sprintf("server %s %s:%d", backend.Id, backend.Address, backend.Port)
@@ -304,6 +308,15 @@ func (b *LoadbalancerCorpus) genHaproxyConfigBackend(data map[string]interface{}
if stickySessionEnable {
serverLine += fmt.Sprintf(" cookie %q", backend.Id)
}
if listenerSendProxy != "" {
serverLine += " " + listenerSendProxy
} else if sendProxy, err := agentutils.HaproxySendProxy(backend.SendProxy); err != nil {
return fmt.Errorf("backend %s(%s): %v", backend.Name, backend.Id, err)
} else if sendProxy != "" {
serverLine += " " + sendProxy
} else {
// nothing to do
}
serverLines = append(serverLines, serverLine)
}
data["servers"] = serverLines
pkg/lbagent/utils/haproxy.go
+19
View File
@@ -17,6 +17,8 @@ package utils
import (
"fmt"
"strings"
"yunion.io/x/onecloud/pkg/apis/compute"
)
const HaproxyCfgExt = "cfg"
@@ -83,3 +85,20 @@ func HaproxyConfigHttpCheckExpect(s string) string {
s = fmt.Sprintf("http-check expect rstatus %s", s)
return s
}
func HaproxySendProxy(s string) (r string, err error) {
switch s {
case compute.LB_SENDPROXY_OFF, "":
case compute.LB_SENDPROXY_V1:
r = "send-proxy"
case compute.LB_SENDPROXY_V2:
r = "send-proxy-v2"
case compute.LB_SENDPROXY_V2_SSL:
r = "send-proxy-v2-ssl"
case compute.LB_SENDPROXY_V2_SSL_CN:
r = "send-proxy-v2-ssl-cn"
default:
err = fmt.Errorf("unknown SendProxy: %s", s)
}
return
}
pkg/mcclient/models/loadbalancers.go
+4
View File
@@ -73,6 +73,8 @@ type LoadbalancerListener struct {
Scheduler string
SendProxy string
ClientRequestTimeout int
ClientIdleTimeout int
BackendConnectTimeout int
@@ -143,6 +145,8 @@ type LoadbalancerBackend struct {
Weight int
Address string
Port int
SendProxy string
}
type LoadbalancerAclEntry struct {
pkg/mcclient/options/loadbalancerbackends.go
+6
View File
@@ -20,6 +20,8 @@ type LoadbalancerBackendCreateOptions struct {
BackendType string `default:"guest"`
Port *int `required:"true"`
Weight *int `default:"1"`
SendProxy string `choices:"off|v1|v2|v2-ssl|v2-ssl-on"`
}
type LoadbalancerBackendListOptions struct {
@@ -30,6 +32,8 @@ type LoadbalancerBackendListOptions struct {
Weight *int
Address string
Port *int
SendProxy string `choices:"off|v1|v2|v2-ssl|v2-ssl-on"`
}
type LoadbalancerBackendUpdateOptions struct {
@@ -38,6 +42,8 @@ type LoadbalancerBackendUpdateOptions struct {
Weight *int
Port *int
SendProxy string `choices:"off|v1|v2|v2-ssl|v2-ssl-on"`
}
type LoadbalancerBackendGetOptions struct {
pkg/mcclient/options/loadbalancerlisteners.go
+6
View File
@@ -25,6 +25,8 @@ type LoadbalancerListenerCreateOptions struct {
Scheduler string `required:"true" choices:"rr|wrr|wlc|sch|tch"`
SendProxy string `choices:"off|v1|v2|v2-ssl|v2-ssl-cn"`
ClientRequestTimeout *int
ClientIdleTimeout *int
BackendConnectTimeout *int
@@ -77,6 +79,8 @@ type LoadbalancerListenerListOptions struct {
Scheduler string `choices:"rr|wrr|wlc|sch|tch"`
SendProxy string `choices:"off|v1|v2|v2-ssl|v2-ssl-cn"`
ClientRequestTimeout *int
ClientIdleTimeout *int
BackendConnectTimeout *int
@@ -125,6 +129,8 @@ type LoadbalancerListenerUpdateOptions struct {
Scheduler string `choices:"rr|wrr|wlc|sch|tch"`
SendProxy string `choices:"off|v1|v2|v2-ssl|v2-ssl-cn"`
ClientRequestTimeout *int
ClientIdleTimeout *int
BackendConnectTimeout *int