@@ -11,6 +11,7 @@ import (

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 	"github.com/openshift/origin/pkg/client"

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

@@ -334,3 +335,13 @@ func IsOAuthIdentityProvider(provider IdentityProvider) bool {

 	return false

 }

+

+func HasOpenShiftAPILevel(config MasterConfig, apiLevel string) bool {

+	apiLevelSet := util.NewStringSet(config.APILevels...)

+	return apiLevelSet.Has(apiLevel)

+}

+

+func HasKubernetesAPILevel(config KubernetesMasterConfig, apiLevel string) bool {

+	apiLevelSet := util.NewStringSet(config.APILevels...)

+	return apiLevelSet.Has(apiLevel)

+}

@@ -6,6 +6,15 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 )

+var (

+	KnownKubernetesAPILevels   = []string{"v1beta1", "v1beta2", "v1beta3", "v1"}

+	KnownOpenShiftAPILevels    = []string{"v1beta1", "v1beta3", "v1"}

+	DefaultKubernetesAPILevels = []string{"v1beta1", "v1beta2", "v1beta3", "v1"}

+	DefaultOpenShiftAPILevels  = []string{"v1beta1", "v1beta3", "v1"}

+	DeadKubernetesAPILevels    = []string{}

+	DeadOpenShiftAPILevels     = []string{}

+)

+

 // NodeConfig is the fully specified config starting an OpenShift node

 type NodeConfig struct {

 	api.TypeMeta

@@ -51,6 +60,9 @@ type MasterConfig struct {

 	// CORSAllowedOrigins

 	CORSAllowedOrigins []string

+	// APILevels is a list of API levels that should be enabled on startup: v1beta1, v1beta3, v1 as examples

+	APILevels []string

+

 	// MasterPublicURL is how clients can access the OpenShift API server

 	MasterPublicURL string

@@ -432,6 +444,8 @@ type EtcdConfig struct {

 }

 type KubernetesMasterConfig struct {

+	// APILevels is a list of API levels that should be enabled on startup: v1beta1, v1beta2, v1beta3, v1 as examples

+	APILevels []string

 	// MasterIP is the public IP address of kubernetes stuff.  If empty, the first result from net.InterfaceAddrs will be used.

 	MasterIP string

 	// MasterCount is the number of expected masters that should be running. This value defaults to 1 and may be set to a positive integer.

@@ -8,10 +8,18 @@ import (

 func init() {

 	err := newer.Scheme.AddDefaultingFuncs(

+		func(obj *MasterConfig) {

+			if len(obj.APILevels) == 0 {

+				obj.APILevels = newer.DefaultOpenShiftAPILevels

+			}

+		},

 		func(obj *KubernetesMasterConfig) {

 			if obj.MasterCount == 0 {

 				obj.MasterCount = 1

 			}

+			if len(obj.APILevels) == 0 {

+				obj.APILevels = newer.DefaultKubernetesAPILevels

+			}

 		},

 		func(obj *EtcdStorageConfig) {

 			if len(obj.KubernetesStorageVersion) == 0 {

@@ -50,6 +50,9 @@ type MasterConfig struct {

 	// CORSAllowedOrigins

 	CORSAllowedOrigins []string `json:"corsAllowedOrigins"`

+	// APILevels is a list of API levels that should be enabled on startup: v1beta1, v1beta3, v1 as examples

+	APILevels []string `json:"apiLevels"`

+

 	// MasterPublicURL is how clients can access the OpenShift API server

 	MasterPublicURL string `json:"masterPublicURL"`

@@ -421,7 +424,9 @@ type EtcdConfig struct {

 }

 type KubernetesMasterConfig struct {

-	MasterIP string `json:"masterIP"`

+	// APILevels is a list of API levels that should be enabled on startup: v1beta1, v1beta2, v1beta3, v1 as examples

+	APILevels []string `json:"apiLevels"`

+	MasterIP  string   `json:"masterIP"`

 	// MasterCount is the number of expected masters that should be running. This value defaults to 1 and may be set to a positive integer.

 	MasterCount         int      `json:"masterCount"`

 	ServicesSubnet      string   `json:"servicesSubnet"`

@@ -42,7 +42,8 @@ volumeDirectory: ""

 	// Before modifying this constant, ensure any changes have corresponding issues filed for:

 	// - documentation: https://github.com/openshift/openshift-docs/

 	// - install: https://github.com/openshift/openshift-ansible/

-	expectedSerializedMasterConfig = `apiVersion: v1

+	expectedSerializedMasterConfig = `apiLevels: null

+apiVersion: v1

 assetConfig:

   logoutURL: ""

   masterPublicURL: ""

@@ -89,6 +90,7 @@ kubeletClientInfo:

   keyFile: ""

   port: 0

 kubernetesMasterConfig:

+  apiLevels: null

   masterCount: 0

   masterIP: ""

   schedulerConfigFile: ""

@@ -1,19 +1,17 @@

 package validation

 import (

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"

-

 	"github.com/openshift/origin/pkg/cmd/server/api"

 )

-func ValidateAllInOneConfig(master *api.MasterConfig, node *api.NodeConfig) fielderrors.ValidationErrorList {

-	allErrs := fielderrors.ValidationErrorList{}

+func ValidateAllInOneConfig(master *api.MasterConfig, node *api.NodeConfig) ValidationResults {

+	validationResults := ValidationResults{}

-	allErrs = append(allErrs, ValidateMasterConfig(master).Prefix("masterConfig")...)

+	validationResults.Append(ValidateMasterConfig(master).Prefix("masterConfig"))

-	allErrs = append(allErrs, ValidateNodeConfig(node).Prefix("nodeConfig")...)

+	validationResults.AddErrors(ValidateNodeConfig(node).Prefix("nodeConfig")...)

 	// Validation between the configs

-	return allErrs

+	return validationResults

 }

@@ -16,26 +16,56 @@ import (

 	"github.com/openshift/origin/pkg/util/labelselector"

 )

-func ValidateMasterConfig(config *api.MasterConfig) fielderrors.ValidationErrorList {

-	allErrs := fielderrors.ValidationErrorList{}

+type ValidationResults struct {

+	Warnings fielderrors.ValidationErrorList

+	Errors   fielderrors.ValidationErrorList

+}

+

+func (r *ValidationResults) Append(additionalResults ValidationResults) {

+	r.AddErrors(additionalResults.Errors...)

+	r.AddWarnings(additionalResults.Warnings...)

+}

+

+func (r *ValidationResults) AddErrors(errors ...error) {

+	if len(errors) == 0 {

+		return

+	}

+	r.Errors = append(r.Errors, errors...)

+}

+

+func (r *ValidationResults) AddWarnings(warnings ...error) {

+	if len(warnings) == 0 {

+		return

+	}

+	r.Warnings = append(r.Warnings, warnings...)

+}

+

+func (r ValidationResults) Prefix(prefix string) ValidationResults {

+	r.Warnings = r.Warnings.Prefix(prefix)

+	r.Errors = r.Errors.Prefix(prefix)

+	return r

+}

+

+func ValidateMasterConfig(config *api.MasterConfig) ValidationResults {

+	validationResults := ValidationResults{}

 	if _, urlErrs := ValidateURL(config.MasterPublicURL, "masterPublicURL"); len(urlErrs) > 0 {

-		allErrs = append(allErrs, urlErrs...)

+		validationResults.AddErrors(urlErrs...)

 	}

 	if config.AssetConfig != nil {

-		allErrs = append(allErrs, ValidateAssetConfig(config.AssetConfig).Prefix("assetConfig")...)

+		validationResults.AddErrors(ValidateAssetConfig(config.AssetConfig).Prefix("assetConfig")...)

 		colocated := config.AssetConfig.ServingInfo.BindAddress == config.ServingInfo.BindAddress

 		if colocated {

 			publicURL, _ := url.Parse(config.AssetConfig.PublicURL)

 			if publicURL.Path == "/" {

-				allErrs = append(allErrs, fielderrors.NewFieldInvalid("assetConfig.publicURL", config.AssetConfig.PublicURL, "path can not be / when colocated with master API"))

+				validationResults.AddErrors(fielderrors.NewFieldInvalid("assetConfig.publicURL", config.AssetConfig.PublicURL, "path can not be / when colocated with master API"))

 			}

 		}

 		if config.OAuthConfig != nil {

 			if config.OAuthConfig.AssetPublicURL != config.AssetConfig.PublicURL {

-				allErrs = append(allErrs,

+				validationResults.AddErrors(

 					fielderrors.NewFieldInvalid("assetConfig.publicURL", config.AssetConfig.PublicURL, "must match oauthConfig.assetPublicURL"),

 					fielderrors.NewFieldInvalid("oauthConfig.assetPublicURL", config.OAuthConfig.AssetPublicURL, "must match assetConfig.publicURL"),

 				)

@@ -47,60 +77,83 @@ func ValidateMasterConfig(config *api.MasterConfig) fielderrors.ValidationErrorL

 	}

 	if config.DNSConfig != nil {

-		allErrs = append(allErrs, ValidateHostPort(config.DNSConfig.BindAddress, "bindAddress").Prefix("dnsConfig")...)

+		validationResults.AddErrors(ValidateHostPort(config.DNSConfig.BindAddress, "bindAddress").Prefix("dnsConfig")...)

 	}

 	if config.EtcdConfig != nil {

 		etcdConfigErrs := ValidateEtcdConfig(config.EtcdConfig).Prefix("etcdConfig")

-		allErrs = append(allErrs, etcdConfigErrs...)

+		validationResults.AddErrors(etcdConfigErrs...)

 		if len(etcdConfigErrs) == 0 {

 			// Validate the etcdClientInfo with the internal etcdConfig

-			allErrs = append(allErrs, ValidateEtcdConnectionInfo(config.EtcdClientInfo, config.EtcdConfig).Prefix("etcdClientInfo")...)

+			validationResults.AddErrors(ValidateEtcdConnectionInfo(config.EtcdClientInfo, config.EtcdConfig).Prefix("etcdClientInfo")...)

 		} else {

 			// Validate the etcdClientInfo by itself

-			allErrs = append(allErrs, ValidateEtcdConnectionInfo(config.EtcdClientInfo, nil).Prefix("etcdClientInfo")...)

+			validationResults.AddErrors(ValidateEtcdConnectionInfo(config.EtcdClientInfo, nil).Prefix("etcdClientInfo")...)

 		}

 	} else {

 		// Validate the etcdClientInfo by itself

-		allErrs = append(allErrs, ValidateEtcdConnectionInfo(config.EtcdClientInfo, nil).Prefix("etcdClientInfo")...)

+		validationResults.AddErrors(ValidateEtcdConnectionInfo(config.EtcdClientInfo, nil).Prefix("etcdClientInfo")...)

 	}

-	allErrs = append(allErrs, ValidateEtcdStorageConfig(config.EtcdStorageConfig).Prefix("etcdStorageConfig")...)

+	validationResults.AddErrors(ValidateEtcdStorageConfig(config.EtcdStorageConfig).Prefix("etcdStorageConfig")...)

-	allErrs = append(allErrs, ValidateImageConfig(config.ImageConfig).Prefix("imageConfig")...)

+	validationResults.AddErrors(ValidateImageConfig(config.ImageConfig).Prefix("imageConfig")...)

-	allErrs = append(allErrs, ValidateKubeletConnectionInfo(config.KubeletClientInfo).Prefix("kubeletClientInfo")...)

+	validationResults.AddErrors(ValidateKubeletConnectionInfo(config.KubeletClientInfo).Prefix("kubeletClientInfo")...)

 	builtInKubernetes := config.KubernetesMasterConfig != nil

 	if config.KubernetesMasterConfig != nil {

-		allErrs = append(allErrs, ValidateKubernetesMasterConfig(config.KubernetesMasterConfig).Prefix("kubernetesMasterConfig")...)

+		validationResults.Append(ValidateKubernetesMasterConfig(config.KubernetesMasterConfig).Prefix("kubernetesMasterConfig"))

 	}

 	if (config.KubernetesMasterConfig == nil) && (len(config.MasterClients.ExternalKubernetesKubeConfig) == 0) {

-		allErrs = append(allErrs, fielderrors.NewFieldInvalid("kubernetesMasterConfig", config.KubernetesMasterConfig, "either kubernetesMasterConfig or masterClients.externalKubernetesKubeConfig must have a value"))

+		validationResults.AddErrors(fielderrors.NewFieldInvalid("kubernetesMasterConfig", config.KubernetesMasterConfig, "either kubernetesMasterConfig or masterClients.externalKubernetesKubeConfig must have a value"))

 	}

 	if (config.KubernetesMasterConfig != nil) && (len(config.MasterClients.ExternalKubernetesKubeConfig) != 0) {

-		allErrs = append(allErrs, fielderrors.NewFieldInvalid("kubernetesMasterConfig", config.KubernetesMasterConfig, "kubernetesMasterConfig and masterClients.externalKubernetesKubeConfig are mutually exclusive"))

+		validationResults.AddErrors(fielderrors.NewFieldInvalid("kubernetesMasterConfig", config.KubernetesMasterConfig, "kubernetesMasterConfig and masterClients.externalKubernetesKubeConfig are mutually exclusive"))

 	}

-	allErrs = append(allErrs, ValidateKubeConfig(config.MasterClients.DeployerKubeConfig, "deployerKubeConfig").Prefix("masterClients")...)

-	allErrs = append(allErrs, ValidateKubeConfig(config.MasterClients.OpenShiftLoopbackKubeConfig, "openShiftLoopbackKubeConfig").Prefix("masterClients")...)

+	validationResults.AddErrors(ValidateKubeConfig(config.MasterClients.DeployerKubeConfig, "deployerKubeConfig").Prefix("masterClients")...)

+	validationResults.AddErrors(ValidateKubeConfig(config.MasterClients.OpenShiftLoopbackKubeConfig, "openShiftLoopbackKubeConfig").Prefix("masterClients")...)

 	if len(config.MasterClients.ExternalKubernetesKubeConfig) > 0 {

-		allErrs = append(allErrs, ValidateKubeConfig(config.MasterClients.ExternalKubernetesKubeConfig, "externalKubernetesKubeConfig").Prefix("masterClients")...)

+		validationResults.AddErrors(ValidateKubeConfig(config.MasterClients.ExternalKubernetesKubeConfig, "externalKubernetesKubeConfig").Prefix("masterClients")...)

 	}

-	allErrs = append(allErrs, ValidatePolicyConfig(config.PolicyConfig).Prefix("policyConfig")...)

+	validationResults.AddErrors(ValidatePolicyConfig(config.PolicyConfig).Prefix("policyConfig")...)

 	if config.OAuthConfig != nil {

-		allErrs = append(allErrs, ValidateOAuthConfig(config.OAuthConfig).Prefix("oauthConfig")...)

+		validationResults.AddErrors(ValidateOAuthConfig(config.OAuthConfig).Prefix("oauthConfig")...)

 	}

-	allErrs = append(allErrs, ValidateServiceAccountConfig(config.ServiceAccountConfig, builtInKubernetes).Prefix("serviceAccountConfig")...)

+	validationResults.AddErrors(ValidateServiceAccountConfig(config.ServiceAccountConfig, builtInKubernetes).Prefix("serviceAccountConfig")...)

-	allErrs = append(allErrs, ValidateServingInfo(config.ServingInfo).Prefix("servingInfo")...)

+	validationResults.AddErrors(ValidateServingInfo(config.ServingInfo).Prefix("servingInfo")...)

-	allErrs = append(allErrs, ValidateProjectConfig(config.ProjectConfig).Prefix("projectConfig")...)

+	validationResults.AddErrors(ValidateProjectConfig(config.ProjectConfig).Prefix("projectConfig")...)

-	return allErrs

+	validationResults.Append(ValidateAPILevels(config.APILevels, api.KnownOpenShiftAPILevels, api.DeadOpenShiftAPILevels, "apiLevels"))

+

+	return validationResults

+}

+

+func ValidateAPILevels(apiLevels []string, knownAPILevels, deadAPILevels []string, name string) ValidationResults {

+	validationResults := ValidationResults{}

+

+	if len(apiLevels) == 0 {

+		validationResults.AddErrors(fielderrors.NewFieldRequired(name))

+	}

+

+	deadLevels := util.NewStringSet(deadAPILevels...)

+	knownLevels := util.NewStringSet(knownAPILevels...)

+	for i, apiLevel := range apiLevels {

+		if deadLevels.Has(apiLevel) {

+			validationResults.AddWarnings(fielderrors.NewFieldInvalid(fmt.Sprintf(name+"[%d]", i), apiLevel, "unsupported level"))

+		}

+		if !knownLevels.Has(apiLevel) {

+			validationResults.AddWarnings(fielderrors.NewFieldInvalid(fmt.Sprintf(name+"[%d]", i), apiLevel, "unknown level"))

+		}

+	}

+

+	return validationResults

 }

 func ValidateEtcdStorageConfig(config api.EtcdStorageConfig) fielderrors.ValidationErrorList {

@@ -219,34 +272,36 @@ func ValidateKubeletConnectionInfo(config api.KubeletConnectionInfo) fielderrors

 	return allErrs

 }

-func ValidateKubernetesMasterConfig(config *api.KubernetesMasterConfig) fielderrors.ValidationErrorList {

-	allErrs := fielderrors.ValidationErrorList{}

+func ValidateKubernetesMasterConfig(config *api.KubernetesMasterConfig) ValidationResults {

+	validationResults := ValidationResults{}

 	if len(config.MasterIP) > 0 {

-		allErrs = append(allErrs, ValidateSpecifiedIP(config.MasterIP, "masterIP")...)

+		validationResults.AddErrors(ValidateSpecifiedIP(config.MasterIP, "masterIP")...)

 	}

 	if config.MasterCount < 1 {

-		allErrs = append(allErrs, fielderrors.NewFieldInvalid("masterCount", config.MasterCount, "must be a positive integer"))

+		validationResults.AddErrors(fielderrors.NewFieldInvalid("masterCount", config.MasterCount, "must be a positive integer"))

 	}

 	if len(config.ServicesSubnet) > 0 {

 		if _, _, err := net.ParseCIDR(strings.TrimSpace(config.ServicesSubnet)); err != nil {

-			allErrs = append(allErrs, fielderrors.NewFieldInvalid("servicesSubnet", config.ServicesSubnet, "must be a valid CIDR notation IP range (e.g. 172.30.0.0/16)"))

+			validationResults.AddErrors(fielderrors.NewFieldInvalid("servicesSubnet", config.ServicesSubnet, "must be a valid CIDR notation IP range (e.g. 172.30.0.0/16)"))

 		}

 	}

 	if len(config.SchedulerConfigFile) > 0 {

-		allErrs = append(allErrs, ValidateFile(config.SchedulerConfigFile, "schedulerConfigFile")...)

+		validationResults.AddErrors(ValidateFile(config.SchedulerConfigFile, "schedulerConfigFile")...)

 	}

 	for i, nodeName := range config.StaticNodeNames {

 		if len(nodeName) == 0 {

-			allErrs = append(allErrs, fielderrors.NewFieldInvalid(fmt.Sprintf("staticNodeName[%d]", i), nodeName, "may not be empty"))

+			validationResults.AddErrors(fielderrors.NewFieldInvalid(fmt.Sprintf("staticNodeName[%d]", i), nodeName, "may not be empty"))

 		}

 	}

-	return allErrs

+	validationResults.Append(ValidateAPILevels(config.APILevels, api.KnownKubernetesAPILevels, api.DeadKubernetesAPILevels, "apiLevels"))

+

+	return validationResults

 }

 func ValidatePolicyConfig(config api.PolicyConfig) fielderrors.ValidationErrorList {

@@ -3,6 +3,7 @@ package kubernetes

 import (

 	"fmt"

 	"io/ioutil"

+	"net"

 	"os"

 	"time"

@@ -26,6 +27,7 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/namespace"

+	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 )

 const (

@@ -54,7 +56,7 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) []string {

 	}

 	masterConfig := &master.Config{

-		PublicAddress: c.MasterIP,

+		PublicAddress: net.ParseIP(c.Options.MasterIP),

 		ReadWritePort: c.MasterPort,

 		ReadOnlyPort:  c.MasterPort,

@@ -70,14 +72,17 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) []string {

 		KubeletClient:    kubeletClient,

 		APIPrefix:        KubeAPIPrefix,

-		EnableV1: true,

-

 		EnableCoreControllers: true,

-		MasterCount: c.MasterCount,

+		MasterCount: c.Options.MasterCount,

 		Authorizer:       c.Authorizer,

 		AdmissionControl: c.AdmissionControl,

+

+		DisableV1Beta1: !configapi.HasKubernetesAPILevel(c.Options, "v1beta1"),

+		DisableV1Beta2: !configapi.HasKubernetesAPILevel(c.Options, "v1beta2"),

+		DisableV1Beta3: !configapi.HasKubernetesAPILevel(c.Options, "v1beta3"),

+		EnableV1:       configapi.HasKubernetesAPILevel(c.Options, "v1"),

 	}

 	_ = master.New(masterConfig)

@@ -162,8 +167,8 @@ func (c *MasterConfig) createSchedulerConfig() (*scheduler.Config, error) {

 	var configData []byte

 	configFactory := factory.NewConfigFactory(c.KubeClient)

-	if _, err := os.Stat(c.SchedulerConfigFile); err == nil {

-		configData, err = ioutil.ReadFile(c.SchedulerConfigFile)

+	if _, err := os.Stat(c.Options.SchedulerConfigFile); err == nil {

+		configData, err = ioutil.ReadFile(c.Options.SchedulerConfigFile)

 		if err != nil {

 			return nil, fmt.Errorf("Unable to read scheduler config: %v", err)

 		}

@@ -21,12 +21,11 @@ import (

 // MasterConfig defines the required values to start a Kubernetes master

 type MasterConfig struct {

-	MasterIP    net.IP

-	MasterPort  int

-	MasterCount int

+	Options configapi.KubernetesMasterConfig

+

+	MasterPort int

 	// TODO: remove, not used

-	NodeHosts []string

 	PortalNet *net.IPNet

 	RequestContextMapper kapi.RequestContextMapper

@@ -37,8 +36,6 @@ type MasterConfig struct {

 	Authorizer       authorizer.Authorizer

 	AdmissionControl admission.Interface

-

-	SchedulerConfigFile string

 }

 func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextMapper kapi.RequestContextMapper, kubeClient *kclient.Client) (*MasterConfig, error) {

@@ -76,10 +73,9 @@ func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextM

 	}

 	kmaster := &MasterConfig{

-		MasterIP:             net.ParseIP(options.KubernetesMasterConfig.MasterIP),

+		Options: *options.KubernetesMasterConfig,

+

 		MasterPort:           port,

-		MasterCount:          options.KubernetesMasterConfig.MasterCount,

-		NodeHosts:            options.KubernetesMasterConfig.StaticNodeNames,

 		PortalNet:            &portalNet,

 		RequestContextMapper: requestContextMapper,

 		EtcdHelper:           ketcdHelper,

@@ -87,7 +83,6 @@ func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextM

 		KubeletClientConfig:  kubeletClientConfig,

 		Authorizer:           apiserver.NewAlwaysAllowAuthorizer(),

 		AdmissionControl:     admissionController,

-		SchedulerConfigFile:  options.KubernetesMasterConfig.SchedulerConfigFile,

 	}

 	return kmaster, nil

@@ -292,8 +292,6 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 		"processedTemplates": templateregistry.NewREST(false),

 		"templates":          templateetcd.NewREST(c.EtcdHelper),

-		// DEPRECATED: remove with v1beta1

-		"templateConfigs": templateregistry.NewREST(true),

 		"routes": routeregistry.NewREST(routeEtcd, routeAllocator),

@@ -326,16 +324,25 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 		"clusterRoles":          clusterRoleStorage,

 	}

-	if err := c.api_v1beta1(storage).InstallREST(container); err != nil {

-		glog.Fatalf("Unable to initialize v1beta1 API: %v", err)

+	if configapi.HasOpenShiftAPILevel(c.Options, OpenShiftAPIV1Beta1) {

+		// templateConfigs is only available in v1beta1

+		storage["templateConfigs"] = templateregistry.NewREST(true)

+

+		if err := c.api_v1beta1(storage).InstallREST(container); err != nil {

+			glog.Fatalf("Unable to initialize v1beta1 API: %v", err)

+		}

 	}

-	if err := c.api_v1beta3(storage).InstallREST(container); err != nil {

-		glog.Fatalf("Unable to initialize v1beta3 API: %v", err)

+	if configapi.HasOpenShiftAPILevel(c.Options, OpenShiftAPIV1Beta3) {

+		if err := c.api_v1beta3(storage).InstallREST(container); err != nil {

+			glog.Fatalf("Unable to initialize v1beta3 API: %v", err)

+		}

 	}

-	if err := c.api_v1(storage).InstallREST(container); err != nil {

-		glog.Fatalf("Unable to initialize v1 API: %v", err)

+	if configapi.HasOpenShiftAPILevel(c.Options, OpenShiftAPIV1) {

+		if err := c.api_v1(storage).InstallREST(container); err != nil {

+			glog.Fatalf("Unable to initialize v1 API: %v", err)

+		}

 	}

 	var root *restful.WebService

@@ -239,9 +239,14 @@ func (o MasterOptions) RunMaster() error {

 		return nil

 	}

-	errs := validation.ValidateMasterConfig(masterConfig)

-	if len(errs) != 0 {

-		return kerrors.NewInvalid("MasterConfig", o.ConfigFile, errs)

+	validationResults := validation.ValidateMasterConfig(masterConfig)

+	if len(validationResults.Warnings) != 0 {

+		for _, warning := range validationResults.Warnings {

+			glog.Warningf("%v", warning)

+		}

+	}

+	if len(validationResults.Errors) != 0 {

+		return kerrors.NewInvalid("MasterConfig", o.ConfigFile, validationResults.Errors)

 	}

 	if err := StartMaster(masterConfig); err != nil {