diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-15 14:06:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 14:06:31 -0500 |
| commit | bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c (patch) | |
| tree | be25d717c47f8e5b2ef495f15d9cedc32c8b15d2 /roles/openshift_node | |
| parent | 719e608f81fbf539da0dca16234ef271b9cbe3d3 (diff) | |
| parent | 346ce4fc595ed618e589666a87b441b40e392e73 (diff) | |
| download | openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.gz openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.bz2 openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.xz openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.zip | |
Merge pull request #5968 from mgugino-upstream-stage/version-scrub
Removed old version code
Diffstat (limited to 'roles/openshift_node')
| -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 }} |