From 9196bc888bf481b05c3dba03e2e501d25aff6890 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Mon, 20 Nov 2017 17:55:20 -0700
Subject: containerPort must be an int; correctly quote/brace replicas value
The mux containerPort must be an int
The eventrouter REPLICAS must use the double quote/double brace
syntax documented here:
https://docs.openshift.org/latest/dev_guide/templates.html#writing-parameters
And must be escaped because it uses double braces, as explained here:
http://jinja.pocoo.org/docs/dev/templates/#escaping
---
roles/openshift_logging_eventrouter/templates/eventrouter-template.j2 | 2 +-
roles/openshift_logging_mux/templates/mux.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2 b/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
index 5a4f7f762..8529b61d5 100644
--- a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
+++ b/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
@@ -42,7 +42,7 @@ objects:
component: eventrouter
logging-infra: eventrouter
provider: openshift
- replicas: ${REPLICAS}
+ replicas: "${{ '{{' }}REPLICAS{{ '}}' }}"
template:
metadata:
labels:
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2
index cfb13d59b..79e449b73 100644
--- a/roles/openshift_logging_mux/templates/mux.j2
+++ b/roles/openshift_logging_mux/templates/mux.j2
@@ -59,7 +59,7 @@ spec:
{% endif %}
{% endif %}
ports:
- - containerPort: "{{ openshift_logging_mux_port }}"
+ - containerPort: {{ openshift_logging_mux_port }}
name: mux-forward
volumeMounts:
- name: config
--
cgit v1.2.3