DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix var naming issues

Browse source
This commit is contained in:
Liviu Costea 2019-02-01 19:45:17 +02:00
parent b43ba86f94
commit 394549e143
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
charts/argo-cd/templates/argocd-rbac-cm.yaml
View file

@ -9,10 +9,10 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
data: data:
{{- if .Values.rbac.policy-default }} {{- if .Values.rbac.policyDefault }}
policy.default: {{ .Values.rbac.policy-default }} policy.default: {{ .Values.rbac.policyDefault }}
{{- end }} {{- end }}
{{- if .Values.rbac.policy-csv }} {{- if .Values.rbac.policyCsv }}
policy.csv: | policy.csv: |
{{ toYaml .Values.rbac.policy-csv | indent 4 }} {{ toYaml .Values.rbac.policyCsv | indent 4 }}
{{- end }} {{- end }}

39
charts/argo-cd/values.yaml
View file

@ -11,7 +11,7 @@ server:
servicePortHttp: 80 servicePortHttp: 80
servicePortHttps: 443 servicePortHttps: 443
containerMetricsPort: 8082 containerMetricsPort: 8082
metricsPort: 8082 serviceMetricsPort: 8082
image: image:
repository: argoproj/argocd repository: argoproj/argocd
tag: v0.11.0 tag: v0.11.0
@ -50,31 +50,31 @@ config:
sshPrivateKeySecret: sshPrivateKeySecret:
key: privateKey key: privateKey
name: argocd-dev-key name: argocd-dev-key
dexConfig: dexConfig:
# # Argo CD's externally facing base URL. Required for configuring SSO # # Argo CD's externally facing base URL. Required for configuring SSO
# # url: https://argo-cd-demo.argoproj.io # # url: https://argo-cd-demo.argoproj.io
# #
# # A dex connector configuration. See documentation on how to configure SSO: # # A dex connector configuration. See documentation on how to configure SSO:
# # https://github.com/argoproj/argo-cd/blob/master/docs/sso.md#2-configure-argocd-for-sso # # https://github.com/argoproj/argo-cd/blob/master/docs/sso.md#2-configure-argocd-for-sso
connectors: connectors:
# GitHub example # GitHub example
- type: github - type: github
id: github id: github
name: GitHub name: GitHub
config: config:
clientID: aabbccddeeff00112233 clientID: aabbccddeeff00112233
clientSecret: $dex.github.clientSecret clientSecret: $dex.github.clientSecret
orgs: orgs:
- name: your-github-org - name: your-github-org
teams: teams:
# The following keys hold the shared secret for authenticating GitHub/GitLab/BitBucket webhook # The following keys hold the shared secret for authenticating GitHub/GitLab/BitBucket webhook
# events. To enable webhooks, configure one or more of the following keys with the shared git # events. To enable webhooks, configure one or more of the following keys with the shared git
# provider webhook secret. The payload URL configured in the git provider should use the # provider webhook secret. The payload URL configured in the git provider should use the
# /api/webhook endpoint of your Argo CD instance (e.g. https://argocd.example.com/api/webhook) # /api/webhook endpoint of your Argo CD instance (e.g. https://argocd.example.com/api/webhook)
# webhook: webhook:
# githubSecret: githubSecret:
# gitlabSecret: gitlabSecret:
# bitbucketSecret: bitbucketSecret:
rbac: rbac:
# # An RBAC policy .csv file containing additional policy and role definitions. # # An RBAC policy .csv file containing additional policy and role definitions.
# # See https://github.com/argoproj/argo-cd/blob/master/docs/rbac.md on how to write RBAC policies. # # See https://github.com/argoproj/argo-cd/blob/master/docs/rbac.md on how to write RBAC policies.
@ -83,17 +83,16 @@ rbac:
# p, my-org:team-alpha, applications, sync, my-project/*, allow # p, my-org:team-alpha, applications, sync, my-project/*, allow
# # Make all members of "my-org:team-beta" admins # # Make all members of "my-org:team-beta" admins
# g, my-org:team-beta, role:admin # g, my-org:team-beta, role:admin
policy-csv: | policyCsv: |
p, role:org-admin, applications, *, */*, allow p, role:org-admin, applications, *, */*, allow
p, role:org-admin, clusters, get, *, allow p, role:org-admin, clusters, get, *, allow
p, role:org-admin, repositories, get, *, allow p, role:org-admin, repositories, get, *, allow
p, role:org-admin, repositories, create, *, allow p, role:org-admin, repositories, create, *, allow
p, role:org-admin, repositories, update, *, allow p, role:org-admin, repositories, update, *, allow
p, role:org-admin, repositories, delete, *, allow p, role:org-admin, repositories, delete, *, allow
g, your-github-org:your-team, role:org-admin g, your-github-org:your-team, role:org-admin
# The default role Argo CD will fall back to, when authorizing API requests # The default role Argo CD will fall back to, when authorizing API requests
policy-default: role:readonly policyDefault: role:readonly
resources: {} resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious # We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little # choice for the user. This also increases chances charts run on environments with little