summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-01 11:58:07 -0400
committerGitHub <noreply@github.com>2017-08-01 11:58:07 -0400
commit01e48932d615dd17c316c1b9ab00216ab0f3f78d (patch)
treeeb5b9876d0219bca6c667237f9a17f9a70e52efe /roles
parentbf0bf407479458206f48885e43d3e1d3a2eab6e1 (diff)
parent604b0cc7589e1bc12041f7d4201fdf17004d7d7e (diff)
downloadopenshift-01e48932d615dd17c316c1b9ab00216ab0f3f78d.tar.gz
openshift-01e48932d615dd17c316c1b9ab00216ab0f3f78d.tar.bz2
openshift-01e48932d615dd17c316c1b9ab00216ab0f3f78d.tar.xz
openshift-01e48932d615dd17c316c1b9ab00216ab0f3f78d.zip
Merge pull request #4700 from sdodson/rate-limit
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index af3ebc6d2..7964bbb48 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -164,16 +164,16 @@ masterClients:
externalKubernetesClientConnectionOverrides:
acceptContentTypes: application/vnd.kubernetes.protobuf,application/json
contentType: application/vnd.kubernetes.protobuf
- burst: 400
- qps: 200
+ burst: {{ openshift_master_external_ratelimit_burst | default(400) }}
+ qps: {{ openshift_master_external_ratelimit_qps | default(200) }}
{% endif %}
externalKubernetesKubeConfig: ""
{% if openshift.common.version_gte_3_3_or_1_3 | bool %}
openshiftLoopbackClientConnectionOverrides:
acceptContentTypes: application/vnd.kubernetes.protobuf,application/json
contentType: application/vnd.kubernetes.protobuf
- burst: 600
- qps: 300
+ burst: {{ openshift_master_loopback_ratelimit_burst | default(600) }}
+ qps: {{ openshift_master_loopback_ratelimit_qps | default(300) }}
{% endif %}
openshiftLoopbackKubeConfig: openshift-master.kubeconfig
masterPublicURL: {{ openshift.master.public_api_url }}