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

 	"fmt"

 	"io"

+	etcdclient "github.com/coreos/go-etcd/etcd"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

@@ -92,7 +93,12 @@ func (o OverwriteBootstrapPolicyOptions) OverwriteBootstrapPolicy() error {

 		return utilerrors.NewAggregate(err)

 	}

-	etcdHelper, err := etcd.NewOpenShiftEtcdHelper(masterConfig.EtcdClientInfo)

+	// Connect and setup etcd interfaces

+	etcdClient, err := etcd.GetAndTestEtcdClient(masterConfig.EtcdClientInfo)

+	if err != nil {

+		return err

+	}

+	etcdHelper, err := newEtcdHelper(etcdClient, masterConfig.EtcdStorageConfig.OpenShiftStorageVersion)

 	if err != nil {

 		return err

 	}

@@ -169,3 +175,12 @@ func OverwriteBootstrapPolicy(etcdHelper tools.EtcdHelper, masterNamespace, poli

 		return nil

 	})

 }

+

+// newEtcdHelper returns an EtcdHelper for the provided storage version.

+func newEtcdHelper(client *etcdclient.Client, version string) (oshelper tools.EtcdHelper, err error) {

+	interfaces, err := latest.InterfacesFor(version)

+	if err != nil {

+		return tools.EtcdHelper{}, err

+	}

+	return tools.NewEtcdHelper(client, interfaces.Codec), nil

+}

@@ -47,8 +47,13 @@ type MasterConfig struct {

 	// CORSAllowedOrigins

 	CORSAllowedOrigins []string

+	// EtcdStorageConfig contains information about how API resources are

+	// stored in Etcd. These values are only relevant when etcd is the

+	// backing store for the cluster.

+	EtcdStorageConfig EtcdStorageConfig

 	// EtcdClientInfo contains information about how to connect to etcd

 	EtcdClientInfo EtcdConnectionInfo

+

 	// KubeletClientInfo contains information about how to connect to kubelets

 	KubeletClientInfo KubeletConnectionInfo

@@ -58,7 +63,7 @@ type MasterConfig struct {

 	EtcdConfig *EtcdConfig

 	// OAuthConfig, if present start the /oauth endpoint in this process

 	OAuthConfig *OAuthConfig

-	// AssetConfig, if present start the asset serverin this process

+	// AssetConfig, if present start the asset server in this process

 	AssetConfig *AssetConfig

 	// DNSConfig, if present start the DNS server in this process

 	DNSConfig *DNSConfig

@@ -117,6 +122,17 @@ type EtcdConnectionInfo struct {

 	ClientCert CertInfo

 }

+type EtcdStorageConfig struct {

+	// KubernetesStorageVersion is the API version that Kube resources in etcd should be

+	// serialized to. This value should *not* be advanced until all clients in the

+	// cluster that read from etcd have code that allows them to read the new version.

+	KubernetesStorageVersion string

+	// OpenShiftStorageVersion is the API version that OS resources in etcd should be

+	// serialized to. This value should *not* be advanced until all clients in the

+	// cluster that read from etcd have code that allows them to read the new version.

+	OpenShiftStorageVersion string

+}

+

 type ServingInfo struct {

 	// BindAddress is the ip:port to serve on

 	BindAddress string

@@ -2,11 +2,26 @@ package v1

 import (

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

+

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

 )

 func init() {

-	err := newer.Scheme.AddConversionFuncs(

+	err := newer.Scheme.AddDefaultingFuncs(

+		func(obj *EtcdStorageConfig) {

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

+				obj.KubernetesStorageVersion = "v1beta3"

+			}

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

+				obj.OpenShiftStorageVersion = "v1beta1"

+			}

+		},

+	)

+	if err != nil {

+		// If one of the conversion functions is malformed, detect it immediately.

+		panic(err)

+	}

+	err = newer.Scheme.AddConversionFuncs(

 		func(in *ServingInfo, out *newer.ServingInfo, s conversion.Scope) error {

 			out.BindAddress = in.BindAddress

 			out.ClientCA = in.ClientCA

@@ -46,6 +46,10 @@ type MasterConfig struct {

 	// CORSAllowedOrigins

 	CORSAllowedOrigins []string `json:"corsAllowedOrigins"`

+	// EtcdStorageConfig contains information about how API resources are

+	// stored in Etcd. These values are only relevant when etcd is the

+	// backing store for the cluster.

+	EtcdStorageConfig EtcdStorageConfig `json:"etcdStorageConfig"`

 	// EtcdClientInfo contains information about how to connect to etcd

 	EtcdClientInfo EtcdConnectionInfo `json:"etcdClientInfo"`

 	// KubeletClientInfo contains information about how to connect to kubelets

@@ -57,7 +61,7 @@ type MasterConfig struct {

 	EtcdConfig *EtcdConfig `json:"etcdConfig"`

 	// OAuthConfig, if present start the /oauth endpoint in this process

 	OAuthConfig *OAuthConfig `json:"oauthConfig"`

-	// AssetConfig, if present start the asset serverin this process

+	// AssetConfig, if present start the asset server in this process

 	AssetConfig *AssetConfig `json:"assetConfig"`

 	// DNSConfig, if present start the DNS server in this process

 	DNSConfig *DNSConfig `json:"dnsConfig"`

@@ -115,6 +119,17 @@ type EtcdConnectionInfo struct {

 	CertInfo `json:",inline"`

 }

+type EtcdStorageConfig struct {

+	// KubernetesStorageVersion is the API version that Kube resources in etcd should be

+	// serialized to. This value should *not* be advanced until all clients in the

+	// cluster that read from etcd have code that allows them to read the new version.

+	KubernetesStorageVersion string `json:"kubernetesStorageVersion"`

+	// OpenShiftStorageVersion is the API version that OS resources in etcd should be

+	// serialized to. This value should *not* be advanced until all clients in the

+	// cluster that read from etcd have code that allows them to read the new version.

+	OpenShiftStorageVersion string `json:"openShiftStorageVersion"`

+}

+

 type ServingInfo struct {

 	// BindAddress is the ip:port to serve on

 	BindAddress string `json:"bindAddress"`

@@ -56,6 +56,7 @@ func ValidateMasterConfig(config *api.MasterConfig) fielderrors.ValidationErrorL

 		// Validate the etcdClientInfo by itself

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

 	}

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

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

@@ -79,6 +80,19 @@ func ValidateMasterConfig(config *api.MasterConfig) fielderrors.ValidationErrorL

 	return allErrs

 }

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

+	allErrs := fielderrors.ValidationErrorList{}

+

+	if len(config.KubernetesStorageVersion) == 0 {

+		allErrs = append(allErrs, fielderrors.NewFieldRequired("kubernetesStorageVersion"))

+	}

+	if len(config.OpenShiftStorageVersion) == 0 {

+		allErrs = append(allErrs, fielderrors.NewFieldRequired("openShiftStorageVersion"))

+	}

+

+	return allErrs

+}

+

 func ValidateAssetConfig(config *api.AssetConfig) fielderrors.ValidationErrorList {

 	allErrs := fielderrors.ValidationErrorList{}

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

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

-	"github.com/openshift/origin/pkg/api/latest"

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

 )

@@ -68,9 +67,9 @@ func RunEtcd(etcdServerConfig *configapi.EtcdConfig) {

 	}()

 }

-// GetAndTestEtcdClient creates an etcd client based on the provided config and waits

-// until etcd server is reachable. It errors out and exits if the server cannot

-// be reached for a certain amount of time.

+// GetAndTestEtcdClient creates an etcd client based on the provided config. It will attempt to

+// connect to the etcd server and block until the server responds at least once, or return an

+// error if the server never responded.

 func GetAndTestEtcdClient(etcdClientInfo configapi.EtcdConnectionInfo) (*etcdclient.Client, error) {

 	var etcdClient *etcdclient.Client

@@ -96,7 +95,6 @@ func GetAndTestEtcdClient(etcdClientInfo configapi.EtcdConnectionInfo) (*etcdcli

 	}

 	for i := 0; ; i++ {

-		// TODO: make sure this works with etcd2 (root key may not exist)

 		_, err := etcdClient.Get("/", false, false)

 		if err == nil || tools.IsEtcdNotFound(err) {

 			break

@@ -109,20 +107,3 @@ func GetAndTestEtcdClient(etcdClientInfo configapi.EtcdConnectionInfo) (*etcdcli

 	return etcdClient, nil

 }

-

-// NewOpenShiftEtcdHelper returns an EtcdHelper for the provided arguments or an error if the version

-// is incorrect.

-func NewOpenShiftEtcdHelper(etcdClientInfo configapi.EtcdConnectionInfo) (helper tools.EtcdHelper, err error) {

-	// Connect and setup etcd interfaces

-	client, err := GetAndTestEtcdClient(etcdClientInfo)

-	if err != nil {

-		return tools.EtcdHelper{}, err

-	}

-

-	version := latest.Version

-	interfaces, err := latest.InterfacesFor(version)

-	if err != nil {

-		return helper, err

-	}

-	return tools.NewEtcdHelper(client, interfaces.Codec), nil

-}

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

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

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	klatest "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

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

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer"

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

@@ -49,7 +48,7 @@ func BuildKubernetesMasterConfig(options configapi.MasterConfig, requestContextM

 	if err != nil {

 		return nil, err

 	}

-	ketcdHelper, err := master.NewEtcdHelper(etcdClient, klatest.Version)

+	ketcdHelper, err := master.NewEtcdHelper(etcdClient, options.EtcdStorageConfig.KubernetesStorageVersion)

 	if err != nil {

 		return nil, fmt.Errorf("Error setting up Kubernetes server storage: %v", err)

 	}

@@ -34,7 +34,11 @@ type AuthConfig struct {

 }

 func BuildAuthConfig(options configapi.MasterConfig) (*AuthConfig, error) {

-	etcdHelper, err := etcd.NewOpenShiftEtcdHelper(options.EtcdClientInfo)

+	client, err := etcd.GetAndTestEtcdClient(options.EtcdClientInfo)

+	if err != nil {

+		return nil, err

+	}

+	etcdHelper, err := NewEtcdHelper(client, options.EtcdStorageConfig.OpenShiftStorageVersion)

 	if err != nil {

 		return nil, fmt.Errorf("Error setting up server storage: %v", err)

 	}

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

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

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

 	kmaster "github.com/GoogleCloudPlatform/kubernetes/pkg/master"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"

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

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

@@ -840,19 +839,6 @@ func (c *MasterConfig) ensureCORSAllowedOrigins() []*regexp.Regexp {

 	return allowedOriginRegexps

 }

-// NewEtcdHelper returns an EtcdHelper for the provided arguments or an error if the version

-// is incorrect.

-func NewEtcdHelper(version string, client *etcdclient.Client) (helper tools.EtcdHelper, err error) {

-	if len(version) == 0 {

-		version = latest.Version

-	}

-	interfaces, err := latest.InterfacesFor(version)

-	if err != nil {

-		return helper, err

-	}

-	return tools.NewEtcdHelper(client, interfaces.Codec), nil

-}

-

 // env returns an environment variable, or the defaultValue if it is not set.

 func env(key string, defaultValue string) string {

 	val := os.Getenv(key)

@@ -5,6 +5,8 @@ import (

 	"fmt"

 	"net/http"

+	etcdclient "github.com/coreos/go-etcd/etcd"

+

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

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

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

@@ -27,12 +29,11 @@ import (

 	"github.com/openshift/origin/pkg/authorization/rulevalidation"

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

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

+	"github.com/openshift/origin/pkg/cmd/server/etcd"

+	"github.com/openshift/origin/pkg/cmd/util/variable"

 	accesstokenregistry "github.com/openshift/origin/pkg/oauth/registry/oauthaccesstoken"

 	accesstokenetcd "github.com/openshift/origin/pkg/oauth/registry/oauthaccesstoken/etcd"

 	projectauth "github.com/openshift/origin/pkg/project/auth"

-

-	"github.com/openshift/origin/pkg/cmd/server/etcd"

-	"github.com/openshift/origin/pkg/cmd/util/variable"

 )

 const (

@@ -92,8 +93,11 @@ type MasterConfig struct {

 }

 func BuildMasterConfig(options configapi.MasterConfig) (*MasterConfig, error) {

-

-	etcdHelper, err := etcd.NewOpenShiftEtcdHelper(options.EtcdClientInfo)

+	client, err := etcd.GetAndTestEtcdClient(options.EtcdClientInfo)

+	if err != nil {

+		return nil, err

+	}

+	etcdHelper, err := NewEtcdHelper(client, options.EtcdStorageConfig.OpenShiftStorageVersion)

 	if err != nil {

 		return nil, fmt.Errorf("Error setting up server storage: %v", err)

 	}

@@ -308,3 +312,12 @@ func (c *MasterConfig) DeploymentImageChangeControllerClient() *osclient.Client

 func (c *MasterConfig) OriginNamespaceControllerClients() (*osclient.Client, *kclient.Client) {

 	return c.OSClient, c.KubernetesClient

 }

+

+// NewEtcdHelper returns an EtcdHelper for the provided storage version.

+func NewEtcdHelper(client *etcdclient.Client, version string) (oshelper tools.EtcdHelper, err error) {

+	interfaces, err := latest.InterfacesFor(version)

+	if err != nil {

+		return tools.EtcdHelper{}, err

+	}

+	return tools.NewEtcdHelper(client, interfaces.Codec), nil

+}

@@ -205,7 +205,17 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 		}

 	}

-	return config, nil

+	// Roundtrip the config to v1 and back to ensure proper defaults are set.

+	ext, err := configapi.Scheme.ConvertToVersion(config, "v1")

+	if err != nil {

+		return nil, err

+	}

+	internal, err := configapi.Scheme.ConvertToVersion(ext, "")

+	if err != nil {

+		return nil, err

+	}

+

+	return internal.(*configapi.MasterConfig), nil

 }

 func (args MasterArgs) BuildSerializeableOAuthConfig() (*configapi.OAuthConfig, error) {

@@ -121,7 +121,17 @@ func (args NodeArgs) BuildSerializeableNodeConfig() (*configapi.NodeConfig, erro

 		config.ServingInfo.ClientCA = admin.DefaultKubeletClientCAFile(args.CertArgs.CertDir)

 	}

-	return config, nil

+	// Roundtrip the config to v1 and back to ensure proper defaults are set.

+	ext, err := configapi.Scheme.ConvertToVersion(config, "v1")

+	if err != nil {

+		return nil, err

+	}

+	internal, err := configapi.Scheme.ConvertToVersion(ext, "")

+	if err != nil {

+		return nil, err

+	}

+

+	return internal.(*configapi.NodeConfig), nil

 }

 // defaultHostname returns the default hostname for this system.

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

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

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

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

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

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

 	testutil "github.com/openshift/origin/test/util"

 )

@@ -94,7 +95,12 @@ func TestOverwritePolicyCommand(t *testing.T) {

 		t.Errorf("unexpected error: %v", err)

 	}

-	etcdHelper, err := etcd.NewOpenShiftEtcdHelper(masterConfig.EtcdClientInfo)

+	etcdClient, err := etcd.GetAndTestEtcdClient(masterConfig.EtcdClientInfo)

+	if err != nil {

+		t.Errorf("unexpected error: %v", err)

+	}

+

+	etcdHelper, err := origin.NewEtcdHelper(etcdClient, masterConfig.EtcdStorageConfig.OpenShiftStorageVersion)

 	if err != nil {

 		t.Errorf("unexpected error: %v", err)

 	}

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

 	authapi "github.com/openshift/origin/pkg/auth/api"

 	"github.com/openshift/origin/pkg/auth/userregistry/identitymapper"

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

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

 	"github.com/openshift/origin/pkg/user/api"

 	identityregistry "github.com/openshift/origin/pkg/user/registry/identity"

 	identityetcd "github.com/openshift/origin/pkg/user/registry/identity/etcd"

@@ -78,9 +79,14 @@ func TestUserInitialization(t *testing.T) {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	etcdHelper, err := etcd.NewOpenShiftEtcdHelper(masterConfig.EtcdClientInfo)

+	etcdClient, err := etcd.GetAndTestEtcdClient(masterConfig.EtcdClientInfo)

 	if err != nil {

-		t.Fatalf("unexpected error: %v", err)

+		t.Errorf("unexpected error: %v", err)

+	}

+

+	etcdHelper, err := origin.NewEtcdHelper(etcdClient, masterConfig.EtcdStorageConfig.OpenShiftStorageVersion)

+	if err != nil {

+		t.Errorf("unexpected error: %v", err)

 	}

 	userRegistry := userregistry.NewRegistry(useretcd.NewREST(etcdHelper))