From 346ce4fc595ed618e589666a87b441b40e392e73 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Tue, 31 Oct 2017 17:21:23 -0400 Subject: 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. --- roles/openshift_node/templates/node.yaml.v1.j2 | 2 -- 1 file changed, 2 deletions(-) (limited to 'roles/openshift_node/templates') 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 }} -- cgit v1.2.1