Merge pull request #8762 from jcantrill/1575546_eventrouter_cpu

bug 1575546. Fix logging eventrouter cpu requests

roles/openshift_logging_eventrouter/tasks/install_eventrouter.yaml

@@ -35,6 +35,7 @@
     dest: "{{ tempdir }}/templates/eventrouter-template.yaml"
   vars:
     node_selector: "{{ openshift_logging_eventrouter_nodeselector | default({}) }}"
+    cpu_limit: "{{ openshift_logging_eventrouter_cpu_limit }}"
 
 - name: Create EventRouter template
   oc_obj:
@@ -54,6 +55,7 @@
       IMAGE: "{{ openshift_logging_eventrouter_image }}"
       REPLICAS: "{{ openshift_logging_eventrouter_replicas }}"
       CPU: "{{ openshift_logging_eventrouter_cpu_request }}"
+      CPU_LIMIT: "{{ openshift_logging_eventrouter_cpu_limit }}"
       MEMORY: "{{ openshift_logging_eventrouter_memory_limit }}"
       NAMESPACE: "{{ openshift_logging_eventrouter_namespace }}"
       SINK: "{{ openshift_logging_eventrouter_sink }}"

roles/openshift_logging_eventrouter/templates/2.x/eventrouter-template.j2

@@ -65,8 +65,11 @@ objects:
               imagePullPolicy: IfNotPresent
               resources:
                 limits:
+{% if cpu_limit is defined %}
+                  cpu: ${CPU_LIMIT}
+{% endif %}
                   memory: ${MEMORY}
-                requires:
+                requests:
                   cpu: ${CPU}
                   memory: ${MEMORY}
               volumeMounts:
@@ -104,6 +107,11 @@ parameters:
   - name: CPU
     displayName: CPU
     value: "100m"
+{% if cpu_limit is defined %}
+  - name: CPU_LIMIT
+    displayName: CPU_LIMIT
+    value: "100m"
+{% endif %}
   - name: NAMESPACE
     displayName: Namespace
     value: default

roles/openshift_logging_eventrouter/templates/5.x/eventrouter-template.j2

@@ -65,8 +65,11 @@ objects:
               imagePullPolicy: IfNotPresent
               resources:
                 limits:
+{% if cpu_limit is defined %}
+                  cpu: ${CPU_LIMIT}
+{% endif %}
                   memory: ${MEMORY}
-                requires:
+                requests:
                   cpu: ${CPU}
                   memory: ${MEMORY}
               volumeMounts:
@@ -104,6 +107,11 @@ parameters:
   - name: CPU
     displayName: CPU
     value: "100m"
+{% if cpu_limit is defined %}
+  - name: CPU_LIMIT
+    displayName: CPU_LIMIT
+    value: "100m"
+{% endif %}
   - name: NAMESPACE
     displayName: Namespace
     value: default