Bump HAProxy lib (#228)

carlosedp · Dec 8, 2023 · cf07b7c · cf07b7c
1 parent 7439981
commit cf07b7c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/controllers/backend/haproxy/haproxy_controller.go b/controllers/backend/haproxy/haproxy_controller.go
@@ -359,12 +359,14 @@ func (p *HAProxyProvider) CreatePoolMember(m *lbv1.PoolMember, pool *lbv1.Pool)
 	server := &server.CreateServerParams{
 		Backend: &pool.Name,
 		Data: &models.Server{
-			Name:            m.Node.Name,
-			Address:         m.Node.Host,
-			Port:            pointer.Int64(int64(m.Port)),
-			Check:           "enabled",
-			Inter:           pointer.Int64Ptr(1000), // in ms
-			HealthCheckPort: pointer.Int64(int64(p.monitor.Port)),
+			Name:    m.Node.Name,
+			Address: m.Node.Host,
+			Port:    pointer.Int64(int64(m.Port)),
+			ServerParams: models.ServerParams{
+				Check:           "enabled",
+				Inter:           pointer.Int64Ptr(1000), // in ms
+				HealthCheckPort: pointer.Int64(int64(p.monitor.Port)),
+			},
 		},
 		TransactionID: &p.transaction,
 		Context:       p.ctx,
@@ -398,13 +400,15 @@ func (p *HAProxyProvider) EditPoolMember(m *lbv1.PoolMember, pool *lbv1.Pool, st
 		Backend: &pool.Name,
 		Name:    m.Node.Name,
 		Data: &models.Server{
-			Name:            m.Node.Name,
-			Address:         m.Node.Host,
-			Port:            pointer.Int64(int64(m.Port)),
-			Check:           "enabled",
-			Maintenance:     maintenanceStatus,
-			Inter:           pointer.Int64Ptr(1000), // in ms
-			HealthCheckPort: pointer.Int64(int64(p.monitor.Port)),
+			Name:    m.Node.Name,
+			Address: m.Node.Host,
+			Port:    pointer.Int64(int64(m.Port)),
+			ServerParams: models.ServerParams{
+				Check:           "enabled",
+				Maintenance:     maintenanceStatus,
+				Inter:           pointer.Int64Ptr(1000), // in ms
+				HealthCheckPort: pointer.Int64(int64(p.monitor.Port)),
+			},
 		},
 		TransactionID: &p.transaction,
 		Context:       p.ctx,

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/go-logr/logr v1.3.0
 	github.com/go-openapi/runtime v0.26.0
 	github.com/go-openapi/strfmt v0.21.9
-	github.com/haproxytech/client-native/v4 v4.0.0
+	github.com/haproxytech/client-native/v4 v4.2.0
 	github.com/onsi/ginkgo/v2 v2.13.2
 	github.com/onsi/gomega v1.30.0
 	github.com/prometheus/client_golang v1.17.0

diff --git a/go.sum b/go.sum
@@ -132,8 +132,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/haproxytech/client-native/v4 v4.0.0 h1:4xwQJVWskXPgOEiy6sOstyVLRCGECo2N8XB+Bc5k5hQ=
-github.com/haproxytech/client-native/v4 v4.0.0/go.mod h1:GS5a2VM6kz+IMN52h0VIW7u5udpuSlkzqv+NTyBQMfo=
+github.com/haproxytech/client-native/v4 v4.2.0 h1:2jIu4cquH5sp77/BFhBnMLmWZMQjC4kaG2lxmwxMJrs=
+github.com/haproxytech/client-native/v4 v4.2.0/go.mod h1:lDPpL4NhjyTnfffXd77q4GAIWI8JuvrwvNZJrpUl2ps=
 github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
 github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=