diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2018-01-05 11:06:43 -0600 |
---|---|---|
committer | Eric Wolinetz <ewolinet@redhat.com> | 2018-02-05 13:44:16 -0600 |
commit | d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78 (patch) | |
tree | 1e07b2d1dba87ea685899c167ddc2c85c68344ed /roles/openshift_logging_eventrouter | |
parent | 3e2c7c22a54a3ccf88b49742003a3a4a937683f8 (diff) | |
download | openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.gz openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.bz2 openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.tar.xz openshift-d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78.zip |
Adding support for ES 5.x tech preview opt in
Diffstat (limited to 'roles/openshift_logging_eventrouter')
-rw-r--r-- | roles/openshift_logging_eventrouter/files/2.x/eventrouter-template.yaml (renamed from roles/openshift_logging_eventrouter/files/eventrouter-template.yaml) | 0 | ||||
-rw-r--r-- | roles/openshift_logging_eventrouter/files/5.x/eventrouter-template.yaml | 103 | ||||
-rw-r--r-- | roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml | 2 | ||||
-rw-r--r-- | roles/openshift_logging_eventrouter/templates/5.x/eventrouter-template.j2 (renamed from roles/openshift_logging_eventrouter/templates/eventrouter-template.j2) | 0 |
4 files changed, 104 insertions, 1 deletions
diff --git a/roles/openshift_logging_eventrouter/files/eventrouter-template.yaml b/roles/openshift_logging_eventrouter/files/2.x/eventrouter-template.yaml index cc01c010d..cc01c010d 100644 --- a/roles/openshift_logging_eventrouter/files/eventrouter-template.yaml +++ b/roles/openshift_logging_eventrouter/files/2.x/eventrouter-template.yaml diff --git a/roles/openshift_logging_eventrouter/files/5.x/eventrouter-template.yaml b/roles/openshift_logging_eventrouter/files/5.x/eventrouter-template.yaml new file mode 100644 index 000000000..cc01c010d --- /dev/null +++ b/roles/openshift_logging_eventrouter/files/5.x/eventrouter-template.yaml @@ -0,0 +1,103 @@ +# this openshift template should match (except nodeSelector) jinja2 template in +# ../templates/eventrouter-template.j2 +kind: Template +apiVersion: v1 +metadata: + name: eventrouter-template + annotations: + description: "A pod forwarding kubernetes events to EFK aggregated logging stack." + tags: "events,EFK,logging" +objects: + - kind: ServiceAccount + apiVersion: v1 + metadata: + name: aggregated-logging-eventrouter + - kind: ClusterRole + apiVersion: v1 + metadata: + name: event-reader + rules: + - apiGroups: [""] + resources: ["events"] + verbs: ["get", "watch", "list"] + - kind: ConfigMap + apiVersion: v1 + metadata: + name: logging-eventrouter + data: + config.json: |- + { + "sink": "${SINK}" + } + - kind: DeploymentConfig + apiVersion: v1 + metadata: + name: logging-eventrouter + labels: + component: eventrouter + logging-infra: eventrouter + provider: openshift + spec: + selector: + component: eventrouter + logging-infra: eventrouter + provider: openshift + replicas: ${REPLICAS} + template: + metadata: + labels: + component: eventrouter + logging-infra: eventrouter + provider: openshift + name: logging-eventrouter + spec: + serviceAccount: aggregated-logging-eventrouter + serviceAccountName: aggregated-logging-eventrouter + containers: + - name: kube-eventrouter + image: ${IMAGE} + imagePullPolicy: IfNotPresent + resources: + limits: + memory: ${MEMORY} + cpu: ${CPU} + requires: + memory: ${MEMORY} + volumeMounts: + - name: config-volume + mountPath: /etc/eventrouter + volumes: + - name: config-volume + configMap: + name: logging-eventrouter + - kind: ClusterRoleBinding + apiVersion: v1 + metadata: + name: event-reader-binding + subjects: + - kind: ServiceAccount + name: aggregated-logging-eventrouter + namespace: ${NAMESPACE} + roleRef: + kind: ClusterRole + name: event-reader + +parameters: + - name: SINK + displayName: Sink + value: stdout + - name: REPLICAS + displayName: Replicas + value: "1" + - name: IMAGE + displayName: Image + value: "docker.io/openshift/origin-logging-eventrouter:latest" + - name: MEMORY + displayName: Memory + value: "128Mi" + - name: CPU + displayName: CPU + value: "100m" + - name: NAMESPACE + displayName: Namespace + value: default diff --git a/roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml b/roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml index cbbc6a8ec..fffdd9f8b 100644 --- a/roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml +++ b/roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml @@ -23,7 +23,7 @@ # create EventRouter deployment config - name: Generate EventRouter template template: - src: eventrouter-template.j2 + src: "{{ __base_file_dir }}/eventrouter-template.j2" dest: "{{ tempdir }}/templates/eventrouter-template.yaml" vars: node_selector: "{{ openshift_logging_eventrouter_nodeselector | default({}) }}" diff --git a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2 b/roles/openshift_logging_eventrouter/templates/5.x/eventrouter-template.j2 index 3bd29163b..3bd29163b 100644 --- a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2 +++ b/roles/openshift_logging_eventrouter/templates/5.x/eventrouter-template.j2 |