diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-28 09:17:50 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-28 09:17:50 -0300 |
| commit | 4bb6264a131082cc14f4a16e7b118bea2b5263de (patch) | |
| tree | 924c8da68ec445f66b8399156fd6af072a4d662a | |
| parent | 31707737a5473bb5cf6545b6675b192a64a913c7 (diff) | |
| download | openshift-4bb6264a131082cc14f4a16e7b118bea2b5263de.tar.gz openshift-4bb6264a131082cc14f4a16e7b118bea2b5263de.tar.bz2 openshift-4bb6264a131082cc14f4a16e7b118bea2b5263de.tar.xz openshift-4bb6264a131082cc14f4a16e7b118bea2b5263de.zip | |
Add 3.3 protobuf config stanzas for master/node config.
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 14 | ||||
| -rw-r--r-- | roles/openshift_node/templates/node.yaml.v1.j2 | 7 |
2 files changed, 21 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index b18a42e32..27d7fac8c 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -131,7 +131,21 @@ kubernetesMasterConfig: {% endif %} masterClients: {# TODO: allow user to set externalKubernetesKubeConfig #} +{% if openshift.common.version_gte_3_3_or_1_3 | bool %} + externalKubernetesClientConnectionOverrides: + acceptContentTypes: application/vnd.kubernetes.protobuf,application/json + contentType: application/vnd.kubernetes.protobuf + burst: 400 + ops: 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 + ops: 300 +{% endif %} openshiftLoopbackKubeConfig: openshift-master.kubeconfig masterPublicURL: {{ openshift.master.public_api_url }} networkConfig: diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2 index 9ba1a01dd..cdf1f6dba 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 %} networkPluginName: {{ openshift.common.sdn_network_plugin_name }} |