Skip to content

Commit

Permalink
Revert "fix(server): Disable CN check (Go 15 does not support). Fixes a…
Browse files Browse the repository at this point in the history
…rgoproj#5539 (argoproj#5550)"

This reverts commit 20f0047.
  • Loading branch information
simster7 committed Apr 1, 2021
1 parent cfc0557 commit 0c909a5
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion server/apiserver/argoserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/soheilhy/cmux"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/rest"

Expand Down Expand Up @@ -271,8 +272,13 @@ func (as *argoServer) newHTTPServer(ctx context.Context, port int, artifactServe
}
dialOpts := []grpc.DialOption{
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxGRPCMessageSize)),
grpc.WithInsecure(),
}
if as.tlsConfig != nil {
dialOpts = append(dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(as.tlsConfig)))
} else {
dialOpts = append(dialOpts, grpc.WithInsecure())
}

webhookInterceptor := webhook.Interceptor(as.clients.Kubernetes)

// HTTP 1.1+JSON Server
Expand Down

0 comments on commit 0c909a5

Please sign in to comment.