summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-29 16:39:33 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-29 16:39:33 -0400
commitd25c1ca3b558c3b7ba4b6b37517ca0dcb7d02e22 (patch)
tree24c87dbf9dc1c911b3a2eab756f55e65b0b2b80c /roles
parent417745e0d3304e486f45df84acdef34f17b24cb1 (diff)
parented2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab (diff)
downloadopenshift-d25c1ca3b558c3b7ba4b6b37517ca0dcb7d02e22.tar.gz
openshift-d25c1ca3b558c3b7ba4b6b37517ca0dcb7d02e22.tar.bz2
openshift-d25c1ca3b558c3b7ba4b6b37517ca0dcb7d02e22.tar.xz
openshift-d25c1ca3b558c3b7ba4b6b37517ca0dcb7d02e22.zip
Merge pull request #766 from brenton/master
Conditionalizing the support for the v1beta3 api
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 3e4f78b17..527c5231a 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -1,5 +1,7 @@
apiLevels:
+{% if openshift.common.deployment_type == "enterprise" %}
- v1beta3
+{% endif %}
- v1
apiVersion: v1
assetConfig:
@@ -66,7 +68,9 @@ kubeletClientInfo:
{% if openshift.master.embedded_kube | bool %}
kubernetesMasterConfig:
apiLevels:
+{% if openshift.common.deployment_type == "enterprise" %}
- v1beta3
+{% endif %}
- v1
apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }}
controllerArguments: {{ controller_args if controller_args is defined else 'null' }}