Skip to content

Wait 5 seconds for SPIRE Server socket to be available #80

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

Merged
merged 2 commits into from
Jan 26, 2023
Merged

Wait 5 seconds for SPIRE Server socket to be available #80

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a78367
Wait 5 seconds for SPIRE Server socket to be available
faisal-memon Jan 25, 2023
224b8ae
Merge branch 'main' into 39
azdagron Jan 26, 2023
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: 1 addition & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ func run(ctrlConfig spirev1alpha1.ControllerManagerConfig, options ctrl.Options)
setupLog.Error(err, "invalid trust domain name")
return err
}
setupLog.Info("Dialing SPIRE Server socket")
spireClient, err := spireapi.DialSocket(ctx, ctrlConfig.SPIREServerSocketPath)
if err != nil {
setupLog.Error(err, "unable to dial SPIRE Server socket")
Expand Down
6 changes: 5 additions & 1 deletion pkg/spireapi/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"fmt"
"io"
"path/filepath"
"time"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand All @@ -41,7 +42,10 @@ func DialSocket(ctx context.Context, path string) (Client, error) {
} else {
target = "unix:" + path
}
grpcClient, err := grpc.DialContext(ctx, target, grpc.WithTransportCredentials(insecure.NewCredentials()))

ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
grpcClient, err := grpc.DialContext(ctx, target, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
if err != nil {
return nil, fmt.Errorf("failed to dial API socket: %w", err)
}
Expand Down