Browse Source

Merge pull request #766 from brenton/master

Conditionalizing the support for the v1beta3 api
Brenton Leanhardt 9 years ago
parent
commit
d25c1ca3b5
1 changed files with 4 additions and 0 deletions
  1. 4 0
      roles/openshift_master/templates/master.yaml.v1.j2

+ 4 - 0
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' }}