diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-08 17:19:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 17:19:38 -0400 |
| commit | 2594364683976584c7654fee480a2ec5501dca59 (patch) | |
| tree | dad8a33df9a39b33c965087494cbcad5e959d06b /roles/openshift_node | |
| parent | 9090df2d6c526d570d33d2315d90d80cc105750b (diff) | |
| parent | b3d04f1a54c0109ce38be103ddc7c83f1992c10e (diff) | |
| download | openshift-2594364683976584c7654fee480a2ec5501dca59.tar.gz openshift-2594364683976584c7654fee480a2ec5501dca59.tar.bz2 openshift-2594364683976584c7654fee480a2ec5501dca59.tar.xz openshift-2594364683976584c7654fee480a2ec5501dca59.zip | |
Merge pull request #2211 from dgoodwin/33-upgrade-playbook
1.3 / 3.3 Upgrades
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 701dffa69..4e13d9052 100644 --- a/roles/openshift_node/templates/node.yaml.v1.j2 +++ b/roles/openshift_node/templates/node.yaml.v1.j2 @@ -12,6 +12,13 @@ imageConfig: latest: false kind: NodeConfig kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }} +{% 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: 40 + ops: 20 +{% endif %} masterKubeConfig: system:node:{{ openshift.common.hostname }}.kubeconfig {% if openshift.common.use_openshift_sdn | bool and not openshift.common.version_gte_3_3_or_1_3 | bool %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} |