diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-31 17:21:23 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-14 16:45:59 -0500 |
| commit | 346ce4fc595ed618e589666a87b441b40e392e73 (patch) | |
| tree | b1ff902f89fad74466bcbab7c0d334a49cb7d813 /roles/openshift_node/templates | |
| parent | a7462fda03cd9a749f20f0e5885b3dedefd0447e (diff) | |
| download | openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.gz openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.bz2 openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.xz openshift-346ce4fc595ed618e589666a87b441b40e392e73.zip | |
Removed old version code
This commit removes any references to versions < 1.5/3.5
We assume the version is always greater than or equal to 1.5/3.5.
Diffstat (limited to 'roles/openshift_node/templates')
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 718d35dca..d452cc45c 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -29,13 +29,11 @@ kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yam runtime-request-timeout: - 10m {% endif %} -{% if openshift.common.version_gte_3_3_or_1_3 | bool %} masterClientConnectionOverrides: acceptContentTypes: application/vnd.kubernetes.protobuf,application/json contentType: application/vnd.kubernetes.protobuf burst: 200 qps: 100 -{% endif %} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig {% if openshift_node_use_openshift_sdn | bool %} networkPluginName: {{ openshift_node_sdn_network_plugin_name }} |