fix(argo-applicationset): Fix deployment issue with AppSet v0.1.0 (#650)
* fix: Add supports for private repos configured using SSH Signed-off-by: Matteo Ruina <matteo.ruina@gmail.com> * fix(argo-applicationset): Allow to select with volumes to mount Signed-off-by: Matteo Ruina <matteo.ruina@gmail.com> * Fix RBAC rules Signed-off-by: Matteo Ruina <matteo.ruina@gmail.com> * Fix linting issue Signed-off-by: Matteo Ruina <matteo.ruina@gmail.com> * Fix chart version Signed-off-by: Matteo Ruina <matteo.ruina@gmail.com> Co-authored-by: Jonathan West <jgwest@users.noreply.github.com>
This commit is contained in:
parent
b8f483fb73
commit
4b9c281711
5 changed files with 81 additions and 50 deletions
|
|
@ -49,6 +49,43 @@ spec:
|
|||
protocol: TCP
|
||||
resources:
|
||||
{{- toYaml .Values.resources | nindent 12 }}
|
||||
volumeMounts:
|
||||
{{- if .Values.mountSSHKnownHostsVolume }}
|
||||
- mountPath: /app/config/ssh
|
||||
name: ssh-known-hosts
|
||||
{{- end }}
|
||||
{{- if .Values.mountTLSCertsVolume }}
|
||||
- mountPath: /app/config/tls
|
||||
name: tls-certs
|
||||
{{- end }}
|
||||
{{- if .Values.mountGPGKeysVolume }}
|
||||
- mountPath: /app/config/gpg/source
|
||||
name: gpg-keys
|
||||
{{- end }}
|
||||
{{- if .Values.mountGPGKeyringVolume }}
|
||||
- mountPath: /app/config/gpg/keys
|
||||
name: gpg-keyring
|
||||
{{- end }}
|
||||
volumes:
|
||||
{{- if .Values.mountSSHKnownHostsVolume }}
|
||||
- configMap:
|
||||
name: argocd-ssh-known-hosts-cm
|
||||
name: ssh-known-hosts
|
||||
{{- end }}
|
||||
{{- if .Values.mountTLSCertsVolume }}
|
||||
- configMap:
|
||||
name: argocd-tls-certs-cm
|
||||
name: tls-certs
|
||||
{{- end }}
|
||||
{{- if .Values.mountGPGKeysVolume }}
|
||||
- configMap:
|
||||
name: argocd-gpg-keys-cm
|
||||
name: gpg-keys
|
||||
{{- end }}
|
||||
{{- if .Values.mountGPGKeyringVolume }}
|
||||
- emptyDir: {}
|
||||
name: gpg-keyring
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
|
|
|
|||
|
|
@ -6,73 +6,58 @@ metadata:
|
|||
{{- include "argo-applicationset.labels" . | nindent 4 }}
|
||||
rules:
|
||||
- apiGroups:
|
||||
- argoproj.io
|
||||
- argoproj.io
|
||||
resources:
|
||||
- applications
|
||||
- applicationsets
|
||||
- applicationsets/finalizers
|
||||
- applications
|
||||
- appprojects
|
||||
- applicationsets
|
||||
- applicationsets/finalizers
|
||||
verbs:
|
||||
- create
|
||||
- delete
|
||||
- get
|
||||
- list
|
||||
- patch
|
||||
- update
|
||||
- watch
|
||||
- create
|
||||
- delete
|
||||
- get
|
||||
- list
|
||||
- patch
|
||||
- update
|
||||
- watch
|
||||
- apiGroups:
|
||||
- argoproj.io
|
||||
- argoproj.io
|
||||
resources:
|
||||
- applicationsets/status
|
||||
- applicationsets/status
|
||||
verbs:
|
||||
- get
|
||||
- patch
|
||||
- update
|
||||
- get
|
||||
- patch
|
||||
- update
|
||||
- apiGroups:
|
||||
- ''
|
||||
- ""
|
||||
resources:
|
||||
- events
|
||||
- events
|
||||
verbs:
|
||||
- create
|
||||
- delete
|
||||
- get
|
||||
- list
|
||||
- patch
|
||||
- update
|
||||
- watch
|
||||
- create
|
||||
- delete
|
||||
- get
|
||||
- list
|
||||
- patch
|
||||
- update
|
||||
- watch
|
||||
- apiGroups:
|
||||
- ''
|
||||
resources:
|
||||
- secrets
|
||||
verbs:
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- apiGroups:
|
||||
- ''
|
||||
- ""
|
||||
resources:
|
||||
- secrets
|
||||
- configmaps
|
||||
verbs:
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- create
|
||||
- update
|
||||
- patch
|
||||
- delete
|
||||
- apiGroups:
|
||||
- ''
|
||||
- apps
|
||||
- extensions
|
||||
resources:
|
||||
- configmaps/status
|
||||
- deployments
|
||||
verbs:
|
||||
- get
|
||||
- update
|
||||
- patch
|
||||
- apiGroups:
|
||||
- ''
|
||||
resources:
|
||||
- events
|
||||
verbs:
|
||||
- create
|
||||
- list
|
||||
- watch
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue