Merge pull request #645 from jcantrill/1663113_env_log_vars

fix 1663113. Add component image ENV vars to cluster-logging-operator

Author: openshift-merge-robot

Diff for: deploy/chart/catalog_resources/rh-operators/clusterlogging.v0.0.1.clusterserviceversion.yaml

@@ -92,6 +92,13 @@ spec:
           - cronjobs
           verbs:
           - "*"
+        - apiGroups:
+          - rbac.authorization.k8s.io
+          resources:
+          - roles
+          - rolebindings
+          verbs:
+          - "*"
       - serviceAccountName: elasticsearch-operator
         rules:
         - apiGroups:
@@ -171,6 +178,18 @@ spec:
                         fieldPath: metadata.namespace
                   - name: OPERATOR_NAME
                     value: "cluster-logging-operator"
+                  - name: ELASTICSEARCH_IMAGE
+                    value: "docker.io/openshift/origin-logging-elasticsearch5:latest"
+                  - name: FLUENTD_IMAGE
+                    value: "docker.io/openshift/origin-logging-fluentd:latest"
+                  - name: KIBANA_IMAGE
+                    value: "docker.io/openshift/origin-logging-kibana5:latest"
+                  - name: CURATOR_IMAGE
+                    value: "docker.io/openshift/origin-logging-curator5:latest"
+                  - name: OAUTH_PROXY_IMAGE
+                    value: "docker.io/openshift/oauth-proxy:latest"
+                  - name: RSYSLOG_IMAGE
+                    value: "docker.io/viaq/rsyslog:latest"
       - name: elasticsearch-operator
         spec:
           replicas: 1

Diff for: manifests/0000_30_06-rh-operators.configmap.yaml

@@ -10240,6 +10240,13 @@ data:
                 - cronjobs
                 verbs:
                 - "*"
+              - apiGroups:
+                - rbac.authorization.k8s.io
+                resources:
+                - roles
+                - rolebindings
+                verbs:
+                - "*"
             - serviceAccountName: elasticsearch-operator
               rules:
               - apiGroups:
@@ -10319,6 +10326,18 @@ data:
                               fieldPath: metadata.namespace
                         - name: OPERATOR_NAME
                           value: "cluster-logging-operator"
+                        - name: ELASTICSEARCH_IMAGE
+                          value: "docker.io/openshift/origin-logging-elasticsearch5:latest"
+                        - name: FLUENTD_IMAGE
+                          value: "docker.io/openshift/origin-logging-fluentd:latest"
+                        - name: KIBANA_IMAGE
+                          value: "docker.io/openshift/origin-logging-kibana5:latest"
+                        - name: CURATOR_IMAGE
+                          value: "docker.io/openshift/origin-logging-curator5:latest"
+                        - name: OAUTH_PROXY_IMAGE
+                          value: "docker.io/openshift/oauth-proxy:latest"
+                        - name: RSYSLOG_IMAGE
+                          value: "docker.io/viaq/rsyslog:latest"
             - name: elasticsearch-operator
               spec:
                 replicas: 1