Skip to content

Commit 5a44ebf

Browse files
committed
wip
1 parent 4810784 commit 5a44ebf

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed
Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
namespace: argocd
3+
namespace:
4+
argocd
5+
#- https://raw.githubusercontent.com/argoproj-labs/applicationset/master/manifests/install.yaml?ref=2c62537a8e5a # TODO: switch to the next release when available
46
resources:
57
- https://raw.githubusercontent.com/codefresh-io/argo-cd/kustomize-components/manifests/install.yaml
6-
#- https://raw.githubusercontent.com/argoproj-labs/applicationset/master/manifests/install.yaml?ref=2c62537a8e5a # TODO: switch to the next release when available
78
- default-rbac.yaml
89
images:
910
- name: quay.io/argoproj/argocd
@@ -12,11 +13,10 @@ images:
1213

1314
# will be effective on argo-cd 2.1
1415
configMapGenerator:
15-
- name: argocd-cm
16-
behavior: merge
16+
- behavior: merge
1717
literals:
18-
- "timeout.reconciliation=20s"
19-
- "accounts.admin=apiKey,login" # need to be able to generate apikey for generic eventsource
18+
- timeout.reconciliation=20s
19+
- accounts.admin=apiKey,login
2020
- |
2121
repository.credentials=- passwordSecret:
2222
key: git_token
@@ -25,18 +25,19 @@ configMapGenerator:
2525
usernameSecret:
2626
key: git_username
2727
name: autopilot-secret
28-
- name: argocd-cmd-params-cm
29-
behavior: merge
28+
name: argocd-cm
29+
- behavior: merge
3030
literals:
31-
- "server.insecure=true"
31+
- server.insecure=true
32+
name: argocd-cmd-params-cm
3233

34+
# reset the crbs to `subject.namespace: default`, so that argo-cd will later change them to the actual ns
3335
patches:
34-
# reset the crbs to `subject.namespace: default`, so that argo-cd will later change them to the actual ns
35-
- target:
36-
group: rbac.authorization.k8s.io
37-
version: v1
38-
kind: ClusterRoleBinding
39-
patch: |-
36+
- patch: |-
4037
- op: replace
4138
path: /subjects/0/namespace
4239
value: default
40+
target:
41+
group: rbac.authorization.k8s.io
42+
kind: ClusterRoleBinding
43+
version: v1

0 commit comments

Comments
 (0)