chore: Configure webpack dev server to proxy using HTTPS (argoproj#2812)

highb · Apr 24, 2020 · bac339a · bac339a
1 parent cc136f9
commit bac339a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/cmd/argo/commands/server.go b/cmd/argo/commands/server.go
@@ -80,7 +80,7 @@ See %s`, help.ArgoSever),
  // InsecureSkipVerify will not impact the TLS listener. It is needed for the server to speak to itself for GRPC.
  tlsConfig = &tls.Config{Certificates: []tls.Certificate{cer}, InsecureSkipVerify: true}
  } else {
- log.Warn("You are running in insecure mode. How enable transport security: https://github.com/argoproj/argo/blob/master/docs/tls.md")
+ log.Warn("You are running in insecure mode. Learn how to enable transport layer security: https://github.com/argoproj/argo/blob/master/docs/tls.md")
  }
 
  opts := apiserver.ArgoServerOpts{

diff --git a/server/apiserver/argoserver.go b/server/apiserver/argoserver.go
@@ -171,9 +171,12 @@ func (as *argoServer) Run(ctx context.Context, port int, browserOpenFunc func(st
  go func() { as.checkServeErr("grpcServer", grpcServer.Serve(grpcL)) }()
  go func() { as.checkServeErr("httpServer", httpServer.Serve(httpL)) }()
  go func() { as.checkServeErr("tcpm", tcpm.Serve()) }()
- log.Infof("Argo Server started successfully on address %s", address)
-
- browserOpenFunc("http:https://localhost" + address)
+ url := "http:https://localhost" + address
+ if as.tlsConfig != nil {
+ url = "https://localhost" + address
+ }
+ log.Infof("Argo Server started successfully on %s", url)
+ browserOpenFunc(url)
 
  <-as.stopCh
 }

diff --git a/ui/src/app/webpack.config.js b/ui/src/app/webpack.config.js
@@ -62,15 +62,15 @@ const config = {
  },
  proxy: {
  '/api': {
- 'target': isProd ? '' : 'http:https://localhost:2746',
+ 'target': isProd ? '' : 'https:https://localhost:2746',
  'secure': false,
  },
  '/artifacts': {
- 'target': isProd ? '' : 'http:https://localhost:2746',
+ 'target': isProd ? '' : 'https:https://localhost:2746',
  'secure': false,
  },
  '/artifacts-by-uid': {
- 'target': isProd ? '' : 'http:https://localhost:2746',
+ 'target': isProd ? '' : 'https:https://localhost:2746',
  'secure': false,
  }
  }