fix(argo): Add RBAC permissions for v2.12. (#541)
Signed-off-by: Vlad Losev <vladimir.losev@sage.com> fix(argo): create roles instead of rolebindings when singleNamespace is true Signed-off-by: Alex Sears <me@alexsears.com> fix(argo-cd): correct repo for stable helm charts Signed-off-by: Alex Sears <me@alexsears.com>
This commit is contained in:
parent
391c439de6
commit
93d8b226d1
6 changed files with 54 additions and 4 deletions
|
@ -544,7 +544,7 @@ server:
|
||||||
# name: secret-name
|
# name: secret-name
|
||||||
# key: sshPrivateKey
|
# key: sshPrivateKey
|
||||||
# - type: helm
|
# - type: helm
|
||||||
# url: https://kubernetes-charts.storage.googleapis.com
|
# url: https://charts.helm.sh/stable
|
||||||
# name: stable
|
# name: stable
|
||||||
# - type: helm
|
# - type: helm
|
||||||
# url: https://argoproj.github.io/argo-helm
|
# url: https://argoproj.github.io/argo-helm
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
{{- if .Values.server.enabled }}
|
{{- if .Values.server.enabled }}
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{- else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name }}
|
name: {{ .Release.Name }}-{{ .Values.server.name }}
|
||||||
rules:
|
rules:
|
||||||
|
@ -101,7 +105,11 @@ rules:
|
||||||
- delete
|
- delete
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{- else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template
|
name: {{ .Release.Name }}-{{ .Values.server.name }}-cluster-template
|
||||||
rules:
|
rules:
|
||||||
|
|
|
@ -2,16 +2,18 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
{{- if .Values.singleNamespace }}
|
{{- if .Values.singleNamespace }}
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
|
||||||
{{ else }}
|
{{ else }}
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
||||||
{{- end }}
|
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
name: {{ .Release.Name }}-{{ .Values.server.name}}
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
|
@ -19,12 +21,20 @@ subjects:
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: RoleBinding
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
|
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
|
name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
{{- if .Values.createAggregateRoles }}
|
{{- if .Values.createAggregateRoles }}
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
helm.sh/hook: pre-install
|
helm.sh/hook: pre-install
|
||||||
|
@ -26,7 +30,11 @@ rules:
|
||||||
- watch
|
- watch
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
helm.sh/hook: pre-install
|
helm.sh/hook: pre-install
|
||||||
|
@ -57,7 +65,11 @@ rules:
|
||||||
- watch
|
- watch
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
helm.sh/hook: pre-install
|
helm.sh/hook: pre-install
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{- else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
||||||
rules:
|
rules:
|
||||||
|
@ -127,7 +131,11 @@ rules:
|
||||||
- delete
|
- delete
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{- else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
|
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
|
||||||
rules:
|
rules:
|
||||||
|
|
|
@ -8,7 +8,11 @@ metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
name: {{ .Release.Name }}-{{ .Values.controller.name }}
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
|
@ -27,12 +31,20 @@ subjects:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: RoleBinding
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
|
{{- end }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
|
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
{{- if .Values.singleNamespace }}
|
||||||
|
kind: Role
|
||||||
|
{{ else }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
|
{{- end }}
|
||||||
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
|
name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
|
|
Loading…
Reference in a new issue