Skip to content

Commit

Permalink
fix: Remove broken SSO from quick-starts (argoproj#3327)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexec authored Jun 29, 2020
1 parent 26570fd commit 2b4b734
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 6 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ CONTROLLER_IMAGE_FILE := dist/controller-image.$(VERSION)
STATIC_BUILD ?= true
CI ?= false
PROFILE ?= minimal
# whether or not to start the Argo Service in TLS mode
SECURE := true
AUTH_MODE := hybrid
ifeq ($(PROFILE),sso)
AUTH_MODE := sso
Expand Down Expand Up @@ -387,7 +389,7 @@ endif
grep '127.0.0.1 *minio' /etc/hosts
grep '127.0.0.1 *postgres' /etc/hosts
grep '127.0.0.1 *mysql' /etc/hosts
env ALWAYS_OFFLOAD_NODE_STATUS=$(ALWAYS_OFFLOAD_NODE_STATUS) LOG_LEVEL=$(LOG_LEVEL) VERSION=$(VERSION) AUTH_MODE=$(AUTH_MODE) $(GOPATH)/bin/goreman -set-ports=false -logtime=false start
env SECURE=$(SECURE) ALWAYS_OFFLOAD_NODE_STATUS=$(ALWAYS_OFFLOAD_NODE_STATUS) LOG_LEVEL=$(LOG_LEVEL) VERSION=$(VERSION) AUTH_MODE=$(AUTH_MODE) $(GOPATH)/bin/goreman -set-ports=false -logtime=false start


.PHONY: wait
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
controller: ALWAYS_OFFLOAD_NODE_STATUS=${ALWAYS_OFFLOAD_NODE_STATUS} OFFLOAD_NODE_STATUS_TTL=30s WORKFLOW_GC_PERIOD=30s UPPERIO_DB_DEBUG=1 ARCHIVED_WORKFLOW_GC_PERIOD=30s ./dist/workflow-controller --executor-image argoproj/argoexec:${VERSION} --namespaced --loglevel ${LOG_LEVEL}
argo-server: UPPERIO_DB_DEBUG=1 ./dist/argo --loglevel ${LOG_LEVEL} server --namespaced --auth-mode ${AUTH_MODE} --secure
argo-server: UPPERIO_DB_DEBUG=1 ./dist/argo --loglevel ${LOG_LEVEL} server --namespaced --auth-mode ${AUTH_MODE} --secure=$SECURE
8 changes: 8 additions & 0 deletions hack/port-forward.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,11 @@ mysql=$(kubectl -n argo get pod -l app=mysql -o name)
if [[ "$mysql" != "" ]]; then
pf MySQL "$mysql" 3306
fi

if [[ "$(kubectl -n argo get pod -l app=argo-server -o name)" != "" ]]; then
pf "Argo Server" deploy/argo-server 2746
fi

if [[ "$(kubectl -n argo get pod -l app=workflow-controller -o name)" != "" ]]; then
pf "Workflow Controller" deploy/workflow-controller 9090
fi
2 changes: 1 addition & 1 deletion manifests/quick-start-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ spec:
- --auth-mode
- server
- --auth-mode
- sso
- client
image: argoproj/argocli:latest
name: argo-server
ports:
Expand Down
2 changes: 1 addition & 1 deletion manifests/quick-start-mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ spec:
- --auth-mode
- server
- --auth-mode
- sso
- client
image: argoproj/argocli:latest
name: argo-server
ports:
Expand Down
2 changes: 1 addition & 1 deletion manifests/quick-start-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ spec:
- --auth-mode
- server
- --auth-mode
- sso
- client
image: argoproj/argocli:latest
name: argo-server
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ spec:
- --auth-mode
- server
- --auth-mode
- sso
- client

0 comments on commit 2b4b734

Please sign in to comment.