summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-06 11:07:00 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-06 11:07:02 -0500
commit66573cc1e39f3c71dfb393298cc743490a8f240c (patch)
tree55751d9c5841b80310433b2b984ec367cfc1e04c /roles
parent6a7b20e72b9692b298ac8c911bf78128e115955b (diff)
downloadopenshift-66573cc1e39f3c71dfb393298cc743490a8f240c.tar.gz
openshift-66573cc1e39f3c71dfb393298cc743490a8f240c.tar.bz2
openshift-66573cc1e39f3c71dfb393298cc743490a8f240c.tar.xz
openshift-66573cc1e39f3c71dfb393298cc743490a8f240c.zip
apiLevel changes
- remove kubernetesMasterConfig.apiLevels if >= 3.1/1.1 - change apiLevels conditional from using deployment_type to version_greater_than_3_1_or_1_1
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 9547a6945..725151bed 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -1,5 +1,5 @@
apiLevels:
-{% if openshift.common.deployment_type == "enterprise" %}
+{% if not openshift.common.version_greater_than_3_1_or_1_1 | bool %}
- v1beta3
{% endif %}
- v1
@@ -73,11 +73,11 @@ kubeletClientInfo:
port: 10250
{% if openshift.master.embedded_kube | bool %}
kubernetesMasterConfig:
+{% if not openshift.common.version_greater_than_3_1_or_1_1 | bool %}
apiLevels:
-{% if openshift.common.deployment_type == "enterprise" %}
- v1beta3
-{% endif %}
- v1
+{% endif %}
apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }}
controllerArguments: {{ controller_args if controller_args is defined else 'null' }}
{# TODO: support overriding masterCount #}