summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorAlexander Zagaynov <azagayno@redhat.com>2017-09-05 10:48:51 +0200
committerAlexander Zagaynov <azagayno@redhat.com>2017-09-05 10:48:51 +0200
commit8480ab43c99ede8bad9dc8ea27f676dc2d6af446 (patch)
tree8fc3c00f46b534f153d171c22c1b97408181c04c /roles/openshift_master
parent7277ab699715a2db809b05549e9272197362b99c (diff)
downloadopenshift-8480ab43c99ede8bad9dc8ea27f676dc2d6af446.tar.gz
openshift-8480ab43c99ede8bad9dc8ea27f676dc2d6af446.tar.bz2
openshift-8480ab43c99ede8bad9dc8ea27f676dc2d6af446.tar.xz
openshift-8480ab43c99ede8bad9dc8ea27f676dc2d6af446.zip
fix comment and make it visible to end-user
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j25
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 8e373f4db..2b7f9afc9 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -58,11 +58,12 @@ controllerConfig:
{% endif %}
controllers: '*'
corsAllowedOrigins:
+ # anchor with start (\A) and end (\z) of the string, make the check case insensitive ((?i)) and escape hostname
{% for origin in ['127.0.0.1', 'localhost', openshift.common.ip, openshift.common.public_ip] | union(openshift.common.all_hostnames) | unique %}
- - (?i)\A{{ origin | regex_escape() }}\z {# anchor with start (\A) and end (\z) of the string, make the check case insensitive ((?i)) and escape hostname #}
+ - (?i)\A{{ origin | regex_escape() }}\z
{% endfor %}
{% for custom_origin in openshift.master.custom_cors_origins | default("") %}
- - (?i)\A{{ custom_origin | regex_escape() }}\z {# anchor with start (\A) and end (\z) of the string, make the check case insensitive ((?i)) and escape hostname #}
+ - (?i)\A{{ custom_origin | regex_escape() }}\z
{% endfor %}
{% if 'disabled_features' in openshift.master %}
disabledFeatures: {{ openshift.master.disabled_features | to_json }}