Skip to content
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

build: Disable TLS for dev mode. Fixes #3617 #3618

Merged
merged 4 commits into from
Jul 30, 2020
Merged

build: Disable TLS for dev mode. Fixes #3617 #3618

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9205871
build: Disable TLS for dev mode. Fixes #3617
alexec Jul 28, 2020
350bfef
Merge branch 'master' into fix-3617
alexec Jul 28, 2020
5b330d0
fix-3617
alexec Jul 28, 2020
2e38893
Merge branch 'master' into fix-3617
alexec Jul 30, 2020
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ STATIC_BUILD ?= true
CI ?= false
PROFILE ?= minimal
# whether or not to start the Argo Service in TLS mode
SECURE := true
SECURE := false
AUTH_MODE := hybrid
ifeq ($(PROFILE),sso)
AUTH_MODE := sso
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/argo_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/argoproj/argo/test/e2e/fixtures"
)

const baseUrl = "https://localhost:2746"
const baseUrl = "http://localhost:2746"

var httpClient = &http.Client{
Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}},
Expand Down
4 changes: 1 addition & 3 deletions test/e2e/cli_with_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ func (s *CLIWithServerSuite) BeforeTest(suiteName, testName string) {
token, err := s.GetServiceAccountToken()
s.CheckError(err)
_ = os.Setenv("ARGO_SERVER", "localhost:2746")
_ = os.Setenv("ARGO_SECURE", "true")
_ = os.Setenv("ARGO_INSECURE_SKIP_VERIFY", "true")
_ = os.Setenv("ARGO_SECURE", "false")
_ = os.Setenv("ARGO_TOKEN", "Bearer "+token)
// we should not need this to run any tests
s.kubeConfig = os.Getenv("KUBECONFIG")
Expand All @@ -37,7 +36,6 @@ func (s *CLIWithServerSuite) AfterTest(suiteName, testName string) {
_ = os.Setenv("KUBECONFIG", s.kubeConfig)
_ = os.Unsetenv("ARGO_SERVER")
_ = os.Unsetenv("ARGO_SECURE")
_ = os.Unsetenv("ARGO_INSECURE_SKIP_VERIFY")
_ = os.Unsetenv("ARGO_TOKEN")
s.CLISuite.AfterTest(suiteName, testName)
}
Expand Down