diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-29 13:29:19 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-29 14:55:40 -0400 |
| commit | ed2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab (patch) | |
| tree | 7a1e52cf5c6766363fbd49ccc635643de115526f | |
| parent | f10860ad86d0f8ce6bfb7eb878859475176a25d2 (diff) | |
| download | openshift-ed2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab.tar.gz openshift-ed2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab.tar.bz2 openshift-ed2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab.tar.xz openshift-ed2cd2e10223e7d44fa8fa8dd59b37e8c13f0fab.zip | |
Conditionalizing the support for the v1beta3 api
v1beta3 is only supported on OSE 3.0. For 3.0 the deployment_type was
"enterprise"
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 |
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' }} |