diff --git a/packages/by-name/service-mesh/package.nix b/packages/by-name/service-mesh/package.nix index b52c4c6069..928652f2cc 100644 --- a/packages/by-name/service-mesh/package.nix +++ b/packages/by-name/service-mesh/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-SlRxqvHfvWVtDABLnWiF8Sm8dedx2AX/rAU0cU8zHM4="; + vendorHash = "sha256-j3H7PbuxHRaykwVjHHpZb9KMDZk4bz/pDrAdvI805dk="; subPackages = [ "." ]; diff --git a/service-mesh/go.mod b/service-mesh/go.mod index 2fa070cf70..72bab0b1b9 100644 --- a/service-mesh/go.mod +++ b/service-mesh/go.mod @@ -5,6 +5,7 @@ go 1.23.0 require ( github.com/coreos/go-iptables v0.8.0 github.com/envoyproxy/go-control-plane/envoy v1.32.2 + golang.org/x/sync v0.10.0 google.golang.org/protobuf v1.36.1 ) diff --git a/service-mesh/go.sum b/service-mesh/go.sum index 3d431d6329..2bf2607eaf 100644 --- a/service-mesh/go.sum +++ b/service-mesh/go.sum @@ -12,6 +12,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= diff --git a/service-mesh/main.go b/service-mesh/main.go index 80b9872496..ed551ffc54 100644 --- a/service-mesh/main.go +++ b/service-mesh/main.go @@ -110,7 +110,7 @@ func run() error { Certificates: []tls.Certificate{cert}, ClientCAs: pool, ClientAuth: tls.RequireAndVerifyClientCert, - }).Close() + }) }, } return listener.ListenAndServe(context.TODO(), "0.0.0.0:15007") diff --git a/service-mesh/proxy.go b/service-mesh/proxy.go index f3d0d30244..ee7a12db87 100644 --- a/service-mesh/proxy.go +++ b/service-mesh/proxy.go @@ -88,7 +88,7 @@ func (l *Listener) handle(ctx context.Context, downstreamConn *net.TCPConn) erro } type shutdownConn interface { - io.ReadWriteCloser + net.Conn CloseWrite() error } diff --git a/service-mesh/proxy_linux.go b/service-mesh/proxy_linux.go index 8d53ff3360..cba5dbb42c 100644 --- a/service-mesh/proxy_linux.go +++ b/service-mesh/proxy_linux.go @@ -6,6 +6,6 @@ import "syscall" const ( SOL_IP = syscall.SOL_IP - IP_TRANSPARENT = syscall.SOL_TRANSPARENT + IP_TRANSPARENT = syscall.IP_TRANSPARENT SO_ORIGINAL_DST = 80 )