Skip to content

Commit

Permalink
sync to head (istio#4709)
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Turn on Istio-ca grpc service by default

TODO(wattli): remove the duplicate flags in bin/ and install/
  • Loading branch information
wattli authored and istio-merge-robot committed Apr 3, 2018
1 parent de6a453 commit eb96262
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions security/cmd/istio_ca/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ func init() {
defaultWorkloadMinCertGracePeriod, "The minimum workload certificate rotation grace period.")

// gRPC server for signing CSRs.
flags.StringVar(&opts.grpcHostname, "grpc-hostname", "localhost", "The hostname for GRPC server.")
flags.IntVar(&opts.grpcPort, "grpc-port", 0, "The port number for GRPC server. "+
flags.StringVar(&opts.grpcHostname, "grpc-hostname", "istio-ca", "The hostname for GRPC server.")
flags.IntVar(&opts.grpcPort, "grpc-port", 8060, "The port number for GRPC server. "+
"If unspecified, Istio CA will not server GRPC request.")

// Upstream CA configuration
Expand Down

0 comments on commit eb96262

Please sign in to comment.