Update master branch with latest devs from unstable branch #34

Open
pcaseiro wants to merge 65 commits from unstable into master
1 changed files with 19 additions and 16 deletions
Showing only changes of commit 83b81b1056 - Show all commits

View File

@ -1,3 +1,4 @@
---
# Source: hydra/charts/hydra-maester/templates/rbac.yaml # Source: hydra/charts/hydra-maester/templates/rbac.yaml
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
@ -25,6 +26,7 @@ metadata:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: hydra-maester-account # Service account assigned to the controller pod. name: hydra-maester-account # Service account assigned to the controller pod.
namespace: default
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
@ -51,6 +53,7 @@ metadata:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: hydra-maester-account # Service account assigned to the controller pod. name: hydra-maester-account # Service account assigned to the controller pod.
namespace: default
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role