Skip to content
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.

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

Fix download binaries in the CI workflow #863

Merged
merged 2 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ jobs:
- name: Download all binaries
uses: actions/download-artifact@v4
with:
name: *-binaries
path: ./bin
merge-multiple: true
# Artifact upload doesn't preserve permissions so we need to fix them before use in
Expand Down
2 changes: 1 addition & 1 deletion buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ deps:
- remote: buf.build
owner: googleapis
repository: googleapis
commit: 28151c0d0a1641bf938a7672c500e01d
commit: a86849a25cc04f4dbe9b15ddddfbc488
6 changes: 1 addition & 5 deletions internal/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ func NewClientConn(authority string, tls bool) (*grpc.ClientConn, error) {
creds = grpc.WithTransportCredentials(insecure.NewCredentials())
}

conn, err := grpc.Dial(authority,
creds,
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
)
conn, err := grpc.Dial(authority, creds, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
if err != nil {
return nil, errors.Wrap(err, "dial tinkerbell server")
}
Expand Down
11 changes: 3 additions & 8 deletions internal/grpcserver/grpc_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,9 @@ type Registrar interface {
// SetupGRPC opens a listener and serves a given Registrar's APIs on a gRPC server and returns the listener's address or an error.
func SetupGRPC(ctx context.Context, r Registrar, listenAddr string, errCh chan<- error) (string, error) {
params := []grpc.ServerOption{
grpc.ChainUnaryInterceptor(
grpcprometheus.UnaryServerInterceptor,
otelgrpc.UnaryServerInterceptor(),
),
grpc.ChainStreamInterceptor(
grpcprometheus.StreamServerInterceptor,
otelgrpc.StreamServerInterceptor(),
),
grpc.StatsHandler(otelgrpc.NewServerHandler()),
grpc.UnaryInterceptor(grpcprometheus.UnaryServerInterceptor),
grpc.StreamInterceptor(grpcprometheus.StreamServerInterceptor),
}

// register servers
Expand Down
Loading