ston1th/haproxy-lb
0
0
Fork 0
Code Issues Releases Activity

more work done

Browse source
This commit is contained in:
ston1th 2021-03-06 16:51:36 +01:00
commit 6fda229a8e
23 changed files with 384 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

91
pkg/controller/vip.go
View file

@ -5,62 +5,33 @@ import (
"os/exec"
"time"
"git.giftfish.de/ston1th/haproxy-kb/pkg/cluster"
"git.giftfish.de/ston1th/haproxy-kb/pkg/config"
"git.giftfish.de/ston1th/haproxy-kb/pkg/haproxy"
"git.giftfish.de/ston1th/haproxy-kb/pkg/vip"
"git.giftfish.de/ston1th/haproxy-lb/pkg/api"
"git.giftfish.de/ston1th/haproxy-lb/pkg/cluster"
"git.giftfish.de/ston1th/haproxy-lb/pkg/config"
"git.giftfish.de/ston1th/haproxy-lb/pkg/db"
"git.giftfish.de/ston1th/haproxy-lb/pkg/haproxy"
"git.giftfish.de/ston1th/haproxy-lb/pkg/vip"
"github.com/go-logr/logr"
)
type UpdateAction int
const (
Add UpdateAction = iota
Delete
)
type ConfigUpdate struct {
Action UpdateAction
Config haproxy.LoadBalancer
}
func readConfigUpdates(c chan ConfigUpdate) (cu []ConfigUpdate) {
for len(c) > 0 {
select {
case config := <-c:
cu = append(cu, config)
}
}
return
}
func applyConfigUpdates(cc cluster.CallbackContext, cu []ConfigUpdate) error {
for _, c := range cu {
switch c.Action {
case Add:
addIPs(cc, n, []string{c.Config.IP})
cc.Set(c.Config.IP, nil)
case Delete:
cc.Delete(c.Config.IP)
deleteIPs(cc, n, []string{c.Config.IP})
}
}
}
func NewLBController(cfg *config.Config) (callbacks cluster.Callbacks, err error) {
n, err := vip.NewNetworkWithLabel(cfg.Interface, cfg.Label)
func NewLBController(cfg *config.Config, srv *api.Server, log logr.Logger) (callbacks cluster.Callbacks, err error) {
n, err := vip.NewNetworkWithLabel(cfg.VIP.Interface, cfg.VIP.Label)
if err != nil {
return
}
//TODO
ha, err := haproxy.NewHAProxyManager("")
ha, err := haproxy.NewHAProxyManager(cfg.HAProxyConfig)
if err != nil {
return
}
configUpdate := make(chan ConfigUpdate, 100)
callbacks = cluster.Callbacks{
Leader: func(ctx context.Context, cc cluster.CallbackContext) {
db := db.New(cc)
err := srv.UpdateDB(db)
if err != nil {
cc.Fatal(err, "error initialising api server as leader")
return
}
t := time.NewTicker(time.Second * 10)
if cfg.LeaderHook != "" {
go func() {
@ -72,13 +43,20 @@ func NewLBController(cfg *config.Config) (callbacks cluster.Callbacks, err error
}
for {
cc.Info("leading", "id", cc.ID())
ips, err := db.GetIPs()
if err != nil {
cc.Error("error updating haproxy config", err)
<-t.C
continue
}
addIPs(cc, n, ips)
cfg, err := cc.Get("config")
if err != nil {
cc.Error("error getting config key", err)
<-t.C
continue
}
addIPs(cc, n, cfg.VirtualIPs)
var lbs haproxy.Config
err = ha.UpdateConfig(ctx, lbs)
if err != nil {
@ -89,7 +67,7 @@ func NewLBController(cfg *config.Config) (callbacks cluster.Callbacks, err error
select {
case <-ctx.Done():
t.Stop()
deleteIPs(cc, n, cfg.VirtualIPs)
deleteIPs(cc, n, ips)
cc.Info("leading canceled", "id", cc.ID())
return
case <-t.C:
@ -97,6 +75,12 @@ func NewLBController(cfg *config.Config) (callbacks cluster.Callbacks, err error
}
},
Follower: func(ctx context.Context, cc cluster.CallbackContext) {
db := db.New(cc)
err := srv.UpdateDB(db)
if err != nil {
cc.Fatal(err, "error initialising api server as leader")
return
}
t := time.NewTicker(time.Second * 10)
if cfg.FollowerHook != "" {
go func() {
@ -109,7 +93,13 @@ func NewLBController(cfg *config.Config) (callbacks cluster.Callbacks, err error
for {
cc.Info("following", "id", cc.ID())
//TODO
//deleteIPs(cc, n, cfg.VirtualIPs)
//ips, err := db.GetIPs()
//if err != nil {
// cc.Error("error getting config key", err)
// <-t.C
// continue
//}
//deleteIPs(cc, n, ips)
select {
case <-ctx.Done():
t.Stop()
@ -120,7 +110,12 @@ func NewLBController(cfg *config.Config) (callbacks cluster.Callbacks, err error
}
},
Cleanup: func(ctx context.Context, cc cluster.CallbackContext) {
deleteIPs(cc, n, cfg.VirtualIPs)
db := db.New(cc)
ips, err := db.GetIPs()
if err != nil {
return
}
deleteIPs(cc, n, ips)
},
}
return