Skip to content

Commit 5c7332e

Browse files
committed
chore(argo): split out install into separate manifests
Use separate manifests for the installation to make it easier to follow what pieces are being installed and how we can best patch them. This change is a no-op.
1 parent 47c206d commit 5c7332e

File tree

4 files changed

+75
-35
lines changed

4 files changed

+75
-35
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: argo-server
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: argo-server
10+
args:
11+
- server
12+
# allow SSO, which currently has all clients use the server's ServiceAccount
13+
- --auth-mode=sso
14+
# all other auth via Kubernetes bearer tokens
15+
- --auth-mode=client
16+
# running in namespaced mode and not cluster wide
17+
- --namespaced
18+
# configures the namespace where workflows actually run
19+
- --managed-namespace
20+
- argo-events

components/argo/kustomization.yaml

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,54 @@ apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44

55
resources:
6-
- https://github.com/argoproj/argo-workflows/releases/download/v3.5.10/namespace-install.yaml
6+
# the same as using namespace-install.yaml but easier to follow what the
7+
# actual pieces we are using are
8+
- https://github.com/argoproj/argo-workflows/manifests/base?ref=v3.5.10
9+
- https://github.com/argoproj/argo-workflows/manifests/namespace-install/argo-server-rbac?ref=v3.5.10
10+
- https://github.com/argoproj/argo-workflows/manifests/namespace-install/workflow-controller-rbac?ref=v3.5.10
11+
12+
# ingress for workflows.${DNS_ZONE} to the argo server for the UI
713
- ingress.yaml
814

915
# external secret for SSO auth
1016
- external-secret-argo-sso.yaml
1117

18+
# keep all the images consistent
19+
images:
20+
- name: quay.io/argoproj/workflow-controller
21+
newTag: v3.5.10
22+
- name: quay.io/argoproj/argoexec
23+
newTag: v3.5.10
24+
- name: quay.io/argoproj/argocli
25+
newTag: v3.5.10
26+
1227
patches:
13-
- target: # configure argo-server to use sso and client auth and monitor argo-events namespace
28+
# see the patch for details on the change
29+
- target:
1430
group: apps
1531
version: v1
1632
kind: Deployment
1733
name: argo-server
18-
patch: |-
19-
- op: replace
20-
path: /spec/template/spec/containers/0/args
21-
value:
22-
- server
23-
- --auth-mode=sso
24-
- --auth-mode=client
25-
- --namespaced
26-
- --managed-namespace
27-
- argo-events
34+
path: ./argo-server-deployment.yaml
2835

29-
- target: # configure the workflow controller to monitor the argo-events namespace
36+
# see the patch for details on the change
37+
- target:
3038
group: apps
3139
version: v1
3240
kind: Deployment
3341
name: workflow-controller
34-
patch: |-
35-
- op: replace
36-
path: /spec/template/spec/containers/0/args
37-
value:
38-
- --namespaced
39-
- --managed-namespace
40-
- argo-events
42+
path: ./workflow-controller-deployment.yaml
4143

44+
# see the patch for details on the change
4245
- target:
4346
group: rbac.authorization.k8s.io
4447
version: v1
4548
kind: Role
49+
# this is the role that the workflow-controller runs with
4650
name: argo-role
47-
patch: |-
48-
# grant configmap create, update to allow for memoization of argo workflows
49-
- op: add
50-
path: /rules/0
51-
value:
52-
apiGroups:
53-
- ""
54-
resources:
55-
- configmaps
56-
verbs:
57-
- get
58-
- watch
59-
- list
60-
- create
61-
- update
51+
path: ./workflow-controller-role.yaml
6252

53+
# apply our configuration changes to the configmap
6354
configMapGenerator:
6455
- name: workflow-controller-configmap
6556
behavior: merge
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: workflow-controller
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: workflow-controller
10+
args:
11+
# running in namespaced mode and not cluster wide
12+
- --namespaced
13+
# configures the namespace where workflows actually run
14+
- --managed-namespace
15+
- argo-events
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# grant configmap create, update to allow for memoization of argo workflows
2+
- op: add
3+
path: /rules/0
4+
value:
5+
apiGroups:
6+
- ""
7+
resources:
8+
- configmaps
9+
verbs:
10+
- get
11+
- watch
12+
- list
13+
- create
14+
- update

0 commit comments

Comments
 (0)