Skip to content

Warn when default or provided port not available for API Server #3065

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
Oct 16, 2019
Merged

Warn when default or provided port not available for API Server #3065

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc95957
Warn when default or provided port not available when starting grpc s…
tejal29 Oct 16, 2019
0fdbfb6
Merge branch 'master' into info_warn
tejal29 Oct 16, 2019
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
9 changes: 4 additions & 5 deletions pkg/skaffold/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"google.golang.org/grpc"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
"github.com/GoogleContainerTools/skaffold/proto"
)
Expand Down Expand Up @@ -73,8 +72,8 @@ func Initialize(opts config.SkaffoldOptions) (func() error, error) {
return func() error { return nil }, nil
}
rpcPort := util.GetAvailablePort(originalRPCPort, &sync.Map{})
if rpcPort != originalRPCPort && originalRPCPort != constants.DefaultRPCPort {
logrus.Warnf("provided port %d already in use: using %d instead", originalRPCPort, rpcPort)
if rpcPort != originalRPCPort {
logrus.Warnf("port %d for gRPC server already in use: using %d instead", originalRPCPort, rpcPort)
}
grpcCallback, err := newGRPCServer(rpcPort)
if err != nil {
Expand All @@ -85,8 +84,8 @@ func Initialize(opts config.SkaffoldOptions) (func() error, error) {

originalHTTPPort := opts.RPCHTTPPort
httpPort := util.GetAvailablePort(originalHTTPPort, m)
if httpPort != originalHTTPPort && originalHTTPPort != constants.DefaultRPCHTTPPort {
logrus.Warnf("provided port %d already in use: using %d instead", originalHTTPPort, httpPort)
if httpPort != originalHTTPPort {
logrus.Warnf("port %d for gRPC HTTP server already in use: using %d instead", originalHTTPPort, httpPort)
}

httpCallback, err := newHTTPServer(httpPort, rpcPort)
Expand Down