Skip to content

Local Addr #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robertvolkmann wants to merge 1 commit into from
Closed

Local Addr #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions cmd/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package cmd

import (
"context"
"crypto/tls"
"crypto/x509"
"errors"
"log/slog"
"net"
"time"

v1 "github.com/metal-stack/metal-api/pkg/api/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/keepalive"

v1 "github.com/metal-stack/metal-api/pkg/api/v1"
)

type GrpcClient struct {
Expand All @@ -20,7 +23,7 @@ type GrpcClient struct {

// NewGrpcClient fetches the address and certificates from metal-core needed to communicate with metal-api via grpc,
// and returns a new grpc client that can be used to invoke all provided grpc endpoints.
func NewGrpcClient(log *slog.Logger, address string, cert, key, caCert []byte) (*GrpcClient, error) {
func NewGrpcClient(log *slog.Logger, source, target string, cert, key, caCert []byte) (*GrpcClient, error) {
clientCert, err := tls.X509KeyPair(cert, key)
if err != nil {
return nil, err
Expand All @@ -45,11 +48,23 @@ func NewGrpcClient(log *slog.Logger, address string, cert, key, caCert []byte) (
}

dialOpts := []grpc.DialOption{
grpc.WithContextDialer(func(ctx context.Context, address string) (net.Conn, error) {
dialer := &net.Dialer{
LocalAddr: &net.TCPAddr{
IP: net.ParseIP(source),
Port: 0,
},
KeepAliveConfig: net.KeepAliveConfig{
Enable: true,
},
}
return dialer.DialContext(ctx, "tcp", address)
}),
grpc.WithKeepaliveParams(kacp),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
}

conn, err := grpc.NewClient(address, dialOpts...)
conn, err := grpc.NewClient(target, dialOpts...)
if err != nil {
return nil, err
}
Expand Down
29 changes: 26 additions & 3 deletions cmd/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package cmd
import (
"fmt"
"log/slog"
"net"
"net/http"
httppprof "net/http/pprof"
"os"
Expand Down Expand Up @@ -44,9 +45,31 @@ func Run() {
log.Info("metal-core version", "version", v.V)
log.Info("configuration", "cfg", cfg)

driver, err := metalgo.NewDriver(
transport := &http.Transport{
DialContext: (&net.Dialer{
LocalAddr: &net.TCPAddr{
IP: net.ParseIP(cfg.LoopbackIP),
Port: 0,
},
Timeout: 30 * time.Second,
KeepAliveConfig: net.KeepAliveConfig{
Enable: true,
Interval: 30 * time.Second,
},
}).DialContext,
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}

clientOptions := []metalgo.ClientOption{
metalgo.HMACAuth(cfg.HMACKey, "Metal-Edit"),
metalgo.Transport(transport),
}
driver, err := metalgo.NewClient(
fmt.Sprintf("%s://%s:%d%s", cfg.ApiProtocol, cfg.ApiIP, cfg.ApiPort, cfg.ApiBasePath),
"", cfg.HMACKey, metalgo.AuthType("Metal-Edit"),
clientOptions...,
)
if err != nil {
log.Error("unable to create metal-api driver", "error", err)
Expand All @@ -69,7 +92,7 @@ func Run() {
os.Exit(1)
}

grpcClient, err := NewGrpcClient(log, cfg.GrpcAddress, cert, key, cacert)
grpcClient, err := NewGrpcClient(log, cfg.LoopbackIP, cfg.GrpcAddress, cert, key, cacert)
if err != nil {
log.Error("failed to create grpc client", "error", err)
os.Exit(1)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/metal-stack/go-lldpd v0.4.9
github.com/metal-stack/metal-api v0.40.3
github.com/metal-stack/metal-go v0.40.3
github.com/metal-stack/metal-go v0.40.5-0.20250313114338-fa345040acf7
github.com/metal-stack/v v1.0.3
github.com/prometheus/client_golang v1.21.0
github.com/redis/go-redis/v9 v9.7.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ github.com/metal-stack/metal-api v0.40.3 h1:rgGm2TG5Mrp89AtT8T1dWu3o95qjZZRR7VrM
github.com/metal-stack/metal-api v0.40.3/go.mod h1:gKabQ6AphGDwcg0nc551arLbGpoj0HxU1abOZt8ISMY=
github.com/metal-stack/metal-go v0.40.3 h1:ekgdTY23zHs/XGOg8bUJQFYPTX1GnaqgaT/lgVxS3JI=
github.com/metal-stack/metal-go v0.40.3/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
github.com/metal-stack/metal-go v0.40.5-0.20250313114338-fa345040acf7 h1:Wkt5JRTXIRlFOJ+Fs5L4XeVQEVWNaL7txuzEHG+Po60=
github.com/metal-stack/metal-go v0.40.5-0.20250313114338-fa345040acf7/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
github.com/metal-stack/metal-lib v0.20.2 h1:Dy6JNIo8ku8mdGyuijlBELkvJ/q2SDBpvDyztgAqEDE=
github.com/metal-stack/metal-lib v0.20.2/go.mod h1:zYzXYpNA4nQ+ANx19s/+1Yb/Q6xhS1nQK2yK2/ryXZM=
github.com/metal-stack/security v0.9.3 h1:ZF5rGeZ4fIFe0DFFQWkXsUDCzODyjdrpvKmeaLOz9lo=
Expand Down