Skip to content

Commit a1cd410

Browse files
committed
feat(argo-workflows): update and document SSO and Ingress
We won't be able to make this dynamic and do substitution because that goes against the nature of how kustomize likes to have everything declarative. The dns_zone value was a hack and it doesn't work outside of an AIO setup. Document for the user how they can get things setup and drop applying the SSO and Ingress settings, which aren't necessary if you don't want to hit the UI or the API. Renamed the directory to make it more clear what part this is and be consistent with the app name.
1 parent f9e4626 commit a1cd410

16 files changed

+44
-51
lines changed

apps/site/argo-workflows.yaml

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,6 @@
22
component: argo
33
sources:
44
- ref: understack
5-
path: 'components/argo'
6-
kustomize:
7-
patches:
8-
- target:
9-
kind: ConfigMap
10-
name: workflow-controller-configmap
11-
patch: |-
12-
- op: replace
13-
path: /data/sso
14-
value: |-
15-
# This is the root URL of the OIDC provider (required).
16-
issuer: https://dex.{{.dns_zone}}
17-
# This defines how long your login is valid for (in hours). (optional)
18-
# If omitted, defaults to 10h. Example below is 10 days.
19-
sessionExpiry: 240h
20-
# This is name of the secret and the key in it that contain OIDC client
21-
# ID issued to the application by the provider (required).
22-
clientId:
23-
name: argo-sso
24-
key: client-id
25-
# This is name of the secret and the key in it that contain OIDC client
26-
# secret issued to the application by the provider (required).
27-
clientSecret:
28-
name: argo-sso
29-
key: client-secret
30-
# This is the redirect URL supplied to the provider (optional). It must
31-
# be in the form <argo-server-root-url>/oauth2/callback. It must be
32-
# browser-accessible. If omitted, will be automatically generated.
33-
redirectUrl: https://workflows.{{.dns_zone}}/oauth2/callback
34-
# Additional scopes to request. Typically needed for SSO RBAC. >= v2.12
35-
scopes:
36-
- groups
37-
- email
38-
- profile
39-
# RBAC Config. >= v2.12
40-
rbac:
41-
enabled: false
42-
- target:
43-
kind: Ingress
44-
name: argo-workflows
45-
patch: |-
46-
- op: replace
47-
path: /spec/rules/0/host
48-
value: workflows.{{.dns_zone}}
49-
- op: replace
50-
path: /spec/tls/0/hosts/0
51-
value: workflows.{{.dns_zone}}
5+
path: 'components/argo-workflows'
6+
- ref: deploy
7+
path: '{{.name}}/manifests/argo-workflows'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

components/argo/kustomization.yaml renamed to components/argo-workflows/kustomization.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ resources:
1515
- argo-server-role.yaml
1616
- argo-server-rolebinding.yaml
1717

18-
# ingress for workflows.${DNS_ZONE} to the argo server for the UI
19-
- ingress.yaml
20-
2118
# external secret for SSO auth
2219
- external-secret-argo-sso.yaml
2320

@@ -73,5 +70,4 @@ configMapGenerator:
7370
- name: workflow-controller-configmap
7471
behavior: merge
7572
files:
76-
- sso
7773
- workflowDefaults=workflow-defaults

components/argo/sso renamed to components/argo-workflows/sso

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ clientId:
1313
clientSecret:
1414
name: argo-sso
1515
key: client-secret
16+
# This is the redirect URL supplied to the provider (optional). It must
17+
# be in the form <argo-server-root-url>/oauth2/callback. It must be
18+
# browser-accessible. If omitted, will be automatically generated.
19+
redirectUrl: https://workflows.argo.svc/oauth2/callback
1620
# Additional scopes to request. Typically needed for SSO RBAC. >= v2.12
1721
scopes:
1822
- groups

0 commit comments

Comments
 (0)