diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2015-11-02 12:36:49 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2015-11-02 12:36:49 -0500 |
| commit | a706860af853be6d8bc77ea38593467e827ed527 (patch) | |
| tree | aaaa4997ba9da249ef09f2f509b4b1a25500993c /roles/openshift_master | |
| parent | 5758fdc75659bdd9a02cc56efb7255d677233ad2 (diff) | |
| parent | 63b19e964fcc09e60562fd253d725edcc2ec4aef (diff) | |
Merge pull request #790 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/openshift_master')
| -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' }} |