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_master/templates | |
| 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_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 14 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master_docker/master.docker.service.j2 (renamed from roles/openshift_master/templates/docker/master.docker.service.j2) | 0 |
2 files changed, 14 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 662f23aa3..a5f346543 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_master/templates/docker/master.docker.service.j2 b/roles/openshift_master/templates/master_docker/master.docker.service.j2 index 97f698b68..97f698b68 100644 --- a/roles/openshift_master/templates/docker/master.docker.service.j2 +++ b/roles/openshift_master/templates/master_docker/master.docker.service.j2 |