summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-14 15:33:18 -0500
committerScott Dodson <sdodson@redhat.com>2016-11-14 15:59:32 -0500
commit239c40d5381f9d2eca7d2aa1de3141d27642b0ac (patch)
treedeb253fe00fb35f74bacbf9d946ad6c19784f024
parent6b6cc9cfb47b97e84cf6cf3efe99b950b5a9e7d2 (diff)
downloadopenshift-239c40d5381f9d2eca7d2aa1de3141d27642b0ac.tar.gz
openshift-239c40d5381f9d2eca7d2aa1de3141d27642b0ac.tar.bz2
openshift-239c40d5381f9d2eca7d2aa1de3141d27642b0ac.tar.xz
openshift-239c40d5381f9d2eca7d2aa1de3141d27642b0ac.zip
Sync logging deployer changes from origin to enterprise
Pulls in https://github.com/openshift/origin-aggregated-logging/commit/d40fd9b83a6f6c0fb962db8869e6a35ef4f72751 https://github.com/openshift/origin-aggregated-logging/commit/f55cf03231d3ff2c7c9f2b9c8a4e1c29b4535c9c
-rw-r--r--roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml20
1 files changed, 20 insertions, 0 deletions
diff --git a/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml
index 9cff9daca..ddfda1272 100644
--- a/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml
+++ b/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml
@@ -66,6 +66,15 @@ items:
- watch
- delete
- update
+ - apiVersion: v1
+ kind: ClusterRole
+ metadata:
+ name: rolebinding-reader
+ rules:
+ - resources:
+ - clusterrolebindings
+ verbs:
+ - get
-
apiVersion: v1
kind: RoleBinding
@@ -88,6 +97,17 @@ items:
subjects:
- kind: ServiceAccount
name: logging-deployer
+ -
+ apiVersion: v1
+ kind: RoleBinding
+ metadata:
+ name: logging-elasticsearch-view-role
+ roleRef:
+ kind: ClusterRole
+ name: view
+ subjects:
+ - kind: ServiceAccount
+ name: aggregated-logging-elasticsearch
-
apiVersion: "v1"
kind: "Template"