@@ -123,6 +123,7 @@ type WebConsoleConfig struct {

 	MasterAddr string

 	// MasterPrefix is the OpenShift API context root

 	MasterPrefix string

+	// TODO this is probably unneeded since everything goes through the openshift master's proxy

 	// KubernetesAddr is the host:port the UI should call the kubernetes API on. Scheme is derived from the scheme the UI is served on, so they must be the same.

 	KubernetesAddr string

 	// KubernetesPrefix is the Kubernetes API context root

@@ -152,10 +152,6 @@ type AssetConfig struct {

 	// MasterPublicURL is how the web console can access the OpenShift api server

 	MasterPublicURL string

-

-	// TODO: we probably don't need this since we have a proxy

-	// KubernetesPublicURL is how the web console can access the Kubernetes api server

-	KubernetesPublicURL string

 }

 type OAuthConfig struct {

@@ -151,10 +151,6 @@ type AssetConfig struct {

 	// MasterPublicURL is how the web console can access the OpenShift v1beta3 server

 	MasterPublicURL string `json:"masterPublicURL"`

-

-	// TODO: we probably don't need this since we have a proxy

-	// KubernetesPublicURL is how the web console can access the Kubernetes v1beta3 server

-	KubernetesPublicURL string `json:"kubernetesPublicURL"`

 }

 type OAuthConfig struct {

@@ -96,11 +96,6 @@ func (c *AssetConfig) buildHandler() (http.Handler, error) {

 		return nil, err

 	}

-	k8sURL, err := url.Parse(c.Options.KubernetesPublicURL)

-	if err != nil {

-		return nil, err

-	}

-

 	publicURL, err := url.Parse(c.Options.PublicURL)

 	if err != nil {

 		glog.Fatal(err)

@@ -109,7 +104,7 @@ func (c *AssetConfig) buildHandler() (http.Handler, error) {

 	config := assets.WebConsoleConfig{

 		MasterAddr:        masterURL.Host,

 		MasterPrefix:      OpenShiftAPIPrefix,

-		KubernetesAddr:    k8sURL.Host,

+		KubernetesAddr:    masterURL.Host,

 		KubernetesPrefix:  KubernetesAPIPrefix,

 		OAuthAuthorizeURI: OpenShiftOAuthAuthorizeURL(masterURL.String()),

 		OAuthRedirectBase: c.Options.PublicURL,

@@ -109,30 +109,6 @@ func TestCommandBindingEtcd(t *testing.T) {

 	}

 }

-func TestCommandBindingKubernetes(t *testing.T) {

-	valueToSet := "http://example.org:9123"

-	actualCfg := executeMasterCommand([]string{"--kubernetes=" + valueToSet})

-

-	expectedArgs := NewDefaultMasterArgs()

-	expectedArgs.KubeConnectionArgs.KubernetesAddr.Set(valueToSet)

-

-	if expectedArgs.KubeConnectionArgs.KubernetesAddr.String() != actualCfg.KubeConnectionArgs.KubernetesAddr.String() {

-		t.Errorf("expected %v, got %v", expectedArgs.KubeConnectionArgs.KubernetesAddr.String(), actualCfg.KubeConnectionArgs.KubernetesAddr.String())

-	}

-}

-

-func TestCommandBindingKubernetesPublic(t *testing.T) {

-	valueToSet := "http://example.org:9123"

-	actualCfg := executeMasterCommand([]string{"--public-kubernetes=" + valueToSet})

-

-	expectedArgs := NewDefaultMasterArgs()

-	expectedArgs.KubernetesPublicAddr.Set(valueToSet)

-

-	if expectedArgs.KubernetesPublicAddr.String() != actualCfg.KubernetesPublicAddr.String() {

-		t.Errorf("expected %v, got %v", expectedArgs.KubernetesPublicAddr.String(), actualCfg.KubernetesPublicAddr.String())

-	}

-}

-

 func TestCommandBindingPortalNet(t *testing.T) {

 	valueToSet := "192.168.0.0/16"

 	actualCfg := executeMasterCommand([]string{"--portal-net=" + valueToSet})

@@ -29,26 +29,6 @@ func TestMasterPublicURLNoPathAllowed(t *testing.T) {

 	}

 }

-func TestKubePublicURLNoPathAllowed(t *testing.T) {

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.KubernetesPublicAddr.Set("http://example.com:9012/")

-	err := masterArgs.Validate()

-

-	if err == nil || !strings.Contains(err.Error(), "may not include a path") {

-		t.Errorf("expected %v, got %v", "may not include a path", err)

-	}

-}

-

-func TestKubeURLNoPathAllowed(t *testing.T) {

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.KubeConnectionArgs.KubernetesAddr.Set("http://example.com:9012/")

-	err := masterArgs.Validate()

-

-	if err == nil || !strings.Contains(err.Error(), "may not include a path") {

-		t.Errorf("expected %v, got %v", "may not include a path", err)

-	}

-}

-

 func TestMasterPublicAddressDefaulting(t *testing.T) {

 	expected := "http://example.com:9012"

@@ -109,72 +89,6 @@ func TestAssetBindAddressDefaulting(t *testing.T) {

 	}

 }

-func TestKubernetesPublicAddressDefaultToKubernetesAddress(t *testing.T) {

-	expected := "http://example.com:9012"

-

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.KubeConnectionArgs.KubernetesAddr.Set(expected)

-	masterArgs.MasterPublicAddr.Set("unexpectedpublicmaster")

-	masterArgs.MasterAddr.Set("unexpectedmaster")

-

-	actual, err := masterArgs.GetKubernetesPublicAddress()

-	if err != nil {

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

-	}

-	if expected != actual.String() {

-		t.Fatalf("expected %v, got %v", expected, actual)

-	}

-}

-

-func TestKubernetesPublicAddressDefaultToPublicMasterAddress(t *testing.T) {

-	expected := "http://example.com:9012"

-

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.MasterPublicAddr.Set(expected)

-	masterArgs.MasterAddr.Set("unexpectedmaster")

-

-	actual, err := masterArgs.GetKubernetesPublicAddress()

-	if err != nil {

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

-	}

-	if expected != actual.String() {

-		t.Fatalf("expected %v, got %v", expected, actual)

-	}

-}

-

-func TestKubernetesPublicAddressDefaultToMasterAddress(t *testing.T) {

-	expected := "http://example.com:9012"

-

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.MasterAddr.Set(expected)

-

-	actual, err := masterArgs.GetKubernetesPublicAddress()

-	if err != nil {

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

-	}

-	if expected != actual.String() {

-		t.Fatalf("expected %v, got %v", expected, actual)

-	}

-}

-

-func TestKubernetesPublicAddressExplicit(t *testing.T) {

-	expected := "http://external.com:12445"

-

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.MasterAddr.Set("http://internal.com:9012")

-	masterArgs.KubeConnectionArgs.KubernetesAddr.Set("http://internal.com:9013")

-	masterArgs.MasterPublicAddr.Set("http://internal.com:9014")

-	masterArgs.KubernetesPublicAddr.Set(expected)

-

-	actual, err := masterArgs.GetKubernetesPublicAddress()

-	if err != nil {

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

-	}

-	if expected != actual.String() {

-		t.Fatalf("expected %v, got %v", expected, actual)

-	}

-}

-

 func TestKubernetesAddressDefaulting(t *testing.T) {

 	expected := "http://example.com:9012"

@@ -191,23 +105,6 @@ func TestKubernetesAddressDefaulting(t *testing.T) {

 	}

 }

-func TestKubernetesAddressExplicit(t *testing.T) {

-	expected := "http://external.com:12445"

-

-	masterArgs := NewDefaultMasterArgs()

-	masterArgs.MasterAddr.Set("http://internal.com:9012")

-	masterArgs.KubeConnectionArgs.KubernetesAddr.Set(expected)

-	masterAddr, _ := masterArgs.GetMasterAddress()

-

-	actual, err := masterArgs.KubeConnectionArgs.GetKubernetesAddress(masterAddr)

-	if err != nil {

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

-	}

-	if expected != actual.String() {

-		t.Fatalf("expected %v, got %v", expected, actual)

-	}

-}

-

 func TestEtcdAddressDefaulting(t *testing.T) {

 	expected := "https://example.com:4001"

 	master := "http://example.com:9012"

@@ -364,14 +261,6 @@ func TestKubeClientForExternalKubernetesMasterWithConfig(t *testing.T) {

 	masterArgs := NewDefaultMasterArgs()

 	masterArgs.KubeConnectionArgs.ClientConfigLoadingRules, masterArgs.KubeConnectionArgs.ClientConfig = makeKubeconfig(expectedServer, expectedUser)

-	actualPublic, err := masterArgs.GetKubernetesPublicAddress()

-	if err != nil {

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

-	}

-	if expectedServer != actualPublic.String() {

-		t.Fatalf("expected %v, got %v", expectedServer, actualPublic)

-	}

-

 	masterAddr, _ := masterArgs.GetMasterAddress()

 	actual, err := masterArgs.KubeConnectionArgs.GetKubernetesAddress(masterAddr)

@@ -403,58 +292,14 @@ func TestKubeClientForExternalKubernetesMasterWithErrorKubeconfig(t *testing.T)

 	masterArgs := NewDefaultMasterArgs()

 	masterArgs.KubeConnectionArgs.ClientConfigLoadingRules, masterArgs.KubeConnectionArgs.ClientConfig = makeErrorKubeconfig()

-	// GetKubernetesPublicAddress hits the invalid kubeconfig in the fallback chain

-	_, err := masterArgs.GetKubernetesPublicAddress()

-	if err == nil {

-		t.Fatalf("expected error, got none")

-	}

-

 	// GetKubernetesAddress hits the invalid kubeconfig in the fallback chain

 	masterAddr, _ := masterArgs.GetMasterAddress()

-	_, err = masterArgs.KubeConnectionArgs.GetKubernetesAddress(masterAddr)

+	_, err := masterArgs.KubeConnectionArgs.GetKubernetesAddress(masterAddr)

 	if err == nil {

 		t.Fatalf("expected error, got none")

 	}

 }

-func TestKubeClientForExternalKubernetesMasterWithConflictingKubernetesAddress(t *testing.T) {

-	expectedServer := "https://some-other-server:1234"

-	expectedUser := "myuser"

-

-	masterArgs := NewDefaultMasterArgs()

-	// Explicitly set --kubernetes must match --kubeconfig or return an error

-	masterArgs.KubeConnectionArgs.KubernetesAddr.Set(expectedServer)

-	masterArgs.KubeConnectionArgs.ClientConfigLoadingRules, masterArgs.KubeConnectionArgs.ClientConfig = makeKubeconfig("https://another-server:2345", expectedUser)

-

-	// GetKubernetesAddress returns the explicitly set address

-	masterAddr, _ := masterArgs.GetMasterAddress()

-	actual, err := masterArgs.KubeConnectionArgs.GetKubernetesAddress(masterAddr)

-	if err != nil {

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

-	}

-	if expectedServer != actual.String() {

-		t.Fatalf("expected %v, got %v", expectedServer, actual)

-	}

-}

-

-func TestKubeClientForNodeWithConflictingKubernetesAddress(t *testing.T) {

-	expectedServer := "https://some-other-server:1234"

-	expectedUser := "myuser"

-

-	nodeArgs := NewDefaultNodeArgs()

-	nodeArgs.KubeConnectionArgs.KubernetesAddr.Set(expectedServer)

-	nodeArgs.KubeConnectionArgs.ClientConfigLoadingRules, nodeArgs.KubeConnectionArgs.ClientConfig = makeKubeconfig("https://another-server:2345", expectedUser)

-

-	// GetKubernetesAddress returns the explicitly set address

-	actualServer, err := nodeArgs.KubeConnectionArgs.GetKubernetesAddress(nil)

-	if err != nil {

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

-	}

-	if expectedServer != actualServer.String() {

-		t.Fatalf("expected %v, got %v", expectedServer, actualServer)

-	}

-}

-

 func makeEmptyKubeconfig() (clientcmd.ClientConfigLoadingRules, clientcmd.ClientConfig) {

 	// Set a non-empty CommandLinePath to trigger loading

 	loadingRules := clientcmd.ClientConfigLoadingRules{}

@@ -27,7 +27,8 @@ type KubeConnectionArgs struct {

 }

 func BindKubeConnectionArgs(args *KubeConnectionArgs, flags *pflag.FlagSet, prefix string) {

-	flags.Var(&args.KubernetesAddr, prefix+"kubernetes", "The address of the Kubernetes server (host, host:port, or URL). If specified, no Kubernetes components will be started.")

+	// TODO remove entirely

+	flags.Var(&args.KubernetesAddr, prefix+"kubernetes", "removed in favor of --"+prefix+"kubeconfig")

 	flags.StringVar(&args.ClientConfigLoadingRules.ExplicitPath, prefix+"kubeconfig", "", "Path to the kubeconfig file to use for requests to the Kubernetes API.")

 }

@@ -41,6 +42,14 @@ func NewDefaultKubeConnectionArgs() *KubeConnectionArgs {

 	return config

 }

+func (args KubeConnectionArgs) Validate() error {

+	if args.KubernetesAddr.Provided {

+		return errors.New("--kubernetes is no longer allowed, try using --kubeconfig")

+	}

+

+	return nil

+}

+

 func (args KubeConnectionArgs) GetExternalKubernetesClientConfig() (*client.Config, bool, error) {

 	if len(args.ClientConfigLoadingRules.ExplicitPath) == 0 || args.ClientConfig == nil {

 		return nil, false, nil

@@ -53,10 +62,6 @@ func (args KubeConnectionArgs) GetExternalKubernetesClientConfig() (*client.Conf

 }

 func (args KubeConnectionArgs) GetKubernetesAddress(defaultAddress *url.URL) (*url.URL, error) {

-	if args.KubernetesAddr.Provided {

-		return args.KubernetesAddr.URL, nil

-	}

-

 	config, ok, err := args.GetExternalKubernetesClientConfig()

 	if err != nil {

 		return nil, err

@@ -30,8 +30,7 @@ type MasterArgs struct {

 	EtcdAddr   flagtypes.Addr

 	PortalNet  flagtypes.IPNet

 	// addresses for external clients

-	MasterPublicAddr     flagtypes.Addr

-	KubernetesPublicAddr flagtypes.Addr

+	MasterPublicAddr flagtypes.Addr

 	// DNSBindAddr exposed for integration tests to set

 	DNSBindAddr flagtypes.Addr

@@ -56,7 +55,6 @@ func BindMasterArgs(args *MasterArgs, flags *pflag.FlagSet, prefix string) {

 	flags.Var(&args.MasterAddr, prefix+"master", "The master address for use by OpenShift components (host, host:port, or URL). Scheme and port default to the --listen scheme and port. When unset, attempt to use the first public IPv4 non-loopback address registered on this host.")

 	flags.Var(&args.MasterPublicAddr, prefix+"public-master", "The master address for use by public clients, if different (host, host:port, or URL). Defaults to same as --master.")

 	flags.Var(&args.EtcdAddr, prefix+"etcd", "The address of the etcd server (host, host:port, or URL). If specified, no built-in etcd will be started.")

-	flags.Var(&args.KubernetesPublicAddr, prefix+"public-kubernetes", "The Kubernetes server address for use by public clients, if different. (host, host:port, or URL). Defaults to same as --kubernetes.")

 	flags.Var(&args.PortalNet, prefix+"portal-net", "A CIDR notation IP range from which to assign portal IPs. This must not overlap with any IP ranges assigned to nodes for pods.")

 	flags.StringVar(&args.EtcdDir, prefix+"etcd-dir", "openshift.local.etcd", "The etcd data directory.")

@@ -68,12 +66,11 @@ func BindMasterArgs(args *MasterArgs, flags *pflag.FlagSet, prefix string) {

 // NewDefaultMasterArgs creates MasterArgs with sub-objects created and default values set.

 func NewDefaultMasterArgs() *MasterArgs {

 	config := &MasterArgs{

-		MasterAddr:           flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

-		EtcdAddr:             flagtypes.Addr{Value: "0.0.0.0:4001", DefaultScheme: "https", DefaultPort: 4001}.Default(),

-		PortalNet:            flagtypes.DefaultIPNet("172.30.17.0/24"),

-		MasterPublicAddr:     flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

-		KubernetesPublicAddr: flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

-		DNSBindAddr:          flagtypes.Addr{Value: "0.0.0.0:53", DefaultScheme: "http", DefaultPort: 53, AllowPrefix: true}.Default(),

+		MasterAddr:       flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

+		EtcdAddr:         flagtypes.Addr{Value: "0.0.0.0:4001", DefaultScheme: "https", DefaultPort: 4001}.Default(),

+		PortalNet:        flagtypes.DefaultIPNet("172.30.17.0/24"),

+		MasterPublicAddr: flagtypes.Addr{Value: "localhost:8443", DefaultScheme: "https", DefaultPort: 8443, AllowPrefix: true}.Default(),

+		DNSBindAddr:      flagtypes.Addr{Value: "0.0.0.0:53", DefaultScheme: "http", DefaultPort: 53, AllowPrefix: true}.Default(),

 		ListenArg:          NewDefaultListenArg(),

 		PolicyArgs:         NewDefaultPolicyArgs(),

@@ -92,10 +89,6 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 	if err != nil {

 		return nil, err

 	}

-	kubePublicAddr, err := args.GetKubernetesPublicAddress()

-	if err != nil {

-		return nil, err

-	}

 	assetPublicAddr, err := args.GetAssetPublicAddress()

 	if err != nil {

 		return nil, err

@@ -128,7 +121,7 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 		}

 	}

-	builtInKubernetes := !args.KubeConnectionArgs.KubernetesAddr.Provided && len(args.KubeConnectionArgs.ClientConfigLoadingRules.ExplicitPath) == 0

+	builtInKubernetes := len(args.KubeConnectionArgs.ClientConfigLoadingRules.ExplicitPath) == 0

 	var kubernetesMasterConfig *configapi.KubernetesMasterConfig

 	if builtInKubernetes {

 		kubernetesMasterConfig, err = args.BuildSerializeableKubeMasterConfig()

@@ -162,10 +155,9 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 				BindAddress: args.GetAssetBindAddress(),

 			},

-			LogoutURL:           "",

-			MasterPublicURL:     masterPublicAddr.String(),

-			PublicURL:           assetPublicAddr.String(),

-			KubernetesPublicURL: kubePublicAddr.String(),

+			LogoutURL:       "",

+			MasterPublicURL: masterPublicAddr.String(),

+			PublicURL:       assetPublicAddr.String(),

 		},

 		DNSConfig: &configapi.DNSConfig{

@@ -374,16 +366,14 @@ func (args MasterArgs) Validate() error {

 		return fmt.Errorf("master public url may not include a path: '%v'", addr.Path)

 	}

-	if addr, err := args.KubeConnectionArgs.GetKubernetesAddress(masterAddr); err != nil {

+	if err := args.KubeConnectionArgs.Validate(); err != nil {

 		return err

-	} else if len(addr.Path) != 0 {

-		return fmt.Errorf("kubernetes url may not include a path: '%v'", addr.Path)

 	}

-	if addr, err := args.GetKubernetesPublicAddress(); err != nil {

+	if addr, err := args.KubeConnectionArgs.GetKubernetesAddress(masterAddr); err != nil {

 		return err

 	} else if len(addr.Path) != 0 {

-		return fmt.Errorf("kubernetes public url may not include a path: '%v'", addr.Path)

+		return fmt.Errorf("kubernetes url may not include a path: '%v'", addr.Path)

 	}

 	return nil

@@ -399,16 +389,12 @@ func (args MasterArgs) GetServerCertHostnames() (util.StringSet, error) {

 	if err != nil {

 		return nil, err

 	}

-	kubePublicAddr, err := args.GetKubernetesPublicAddress()

-	if err != nil {

-		return nil, err

-	}

 	assetPublicAddr, err := args.GetAssetPublicAddress()

 	if err != nil {

 		return nil, err

 	}

-	allHostnames := util.NewStringSet("localhost", "127.0.0.1", "openshift.default.local", "kubernetes.default.local", "kubernetes-ro.default.local", masterAddr.Host, masterPublicAddr.Host, kubePublicAddr.Host, assetPublicAddr.Host)

+	allHostnames := util.NewStringSet("localhost", "127.0.0.1", "openshift.default.local", "kubernetes.default.local", "kubernetes-ro.default.local", masterAddr.Host, masterPublicAddr.Host, assetPublicAddr.Host)

 	certHostnames := util.StringSet{}

 	for hostname := range allHostnames {

 		if host, _, err := net.SplitHostPort(hostname); err == nil {

@@ -511,23 +497,6 @@ func (args MasterArgs) GetEtcdPeerAddress() (*url.URL, error) {

 	return etcdAddress, nil

 }

-func (args MasterArgs) GetKubernetesPublicAddress() (*url.URL, error) {

-	if args.KubernetesPublicAddr.Provided {

-		return args.KubernetesPublicAddr.URL, nil

-	}

-	if args.KubeConnectionArgs.KubernetesAddr.Provided {

-		return args.KubeConnectionArgs.KubernetesAddr.URL, nil

-	}

-	config, ok, err := args.KubeConnectionArgs.GetExternalKubernetesClientConfig()

-	if err != nil {

-		return nil, err

-	}

-	if ok && len(config.Host) > 0 {

-		return url.Parse(config.Host)

-	}

-

-	return args.GetMasterPublicAddress()

-}

 func (args MasterArgs) GetAssetPublicAddress() (*url.URL, error) {

 	t, err := args.GetMasterPublicAddress()

@@ -1,6 +1,7 @@

 package start

 import (

+	"errors"

 	"fmt"

 	"net"

 	"net/url"

@@ -27,7 +28,7 @@ type NodeArgs struct {

 	AllowDisabledDocker bool

 	VolumeDir           string

-	DefaultKubernetesURL url.URL

+	DefaultKubernetesURL *url.URL

 	ClusterDomain        string

 	ClusterDNS           net.IP

@@ -70,6 +71,17 @@ func NewDefaultNodeArgs() *NodeArgs {

 	}

 }

+func (args NodeArgs) Validate() error {

+	if err := args.KubeConnectionArgs.Validate(); err != nil {

+		return err

+	}

+	if _, err := args.KubeConnectionArgs.GetKubernetesAddress(args.DefaultKubernetesURL); err != nil {

+		return errors.New("--kubeconfig must be set to provide API server connection information")

+	}

+

+	return nil

+}

+

 // BuildSerializeableNodeConfig takes the NodeArgs (partially complete config) and uses them along with defaulting behavior to create the fully specified

 // config object for starting the node

 func (args NodeArgs) BuildSerializeableNodeConfig() (*configapi.NodeConfig, error) {

@@ -91,7 +91,7 @@ func NewCommandStartAllInOne() (*cobra.Command, *AllInOneOptions) {

 	flags.StringVar(&options.MasterConfigFile, "master-config", "", "Location of the master configuration file to run from, or write to (when used with --write-config). When running from configuration files, all other command-line arguments are ignored.")

 	flags.StringVar(&options.NodeConfigFile, "node-config", "", "Location of the node configuration file to run from, or write to (when used with --write-config). When running from configuration files, all other command-line arguments are ignored.")

-	masterArgs, nodeArgs, listenArg, imageFormatArgs, kubeConnectionArgs, certArgs := GetAllInOneArgs()

+	masterArgs, nodeArgs, listenArg, imageFormatArgs, _, certArgs := GetAllInOneArgs()

 	options.MasterArgs, options.NodeArgs = masterArgs, nodeArgs

 	// by default, all-in-ones all disabled docker.  Set it here so that if we allow it to be bound later, bindings take precendence

 	options.NodeArgs.AllowDisabledDocker = true

@@ -101,7 +101,6 @@ func NewCommandStartAllInOne() (*cobra.Command, *AllInOneOptions) {

 	BindListenArg(listenArg, flags, "")

 	BindPolicyArgs(options.MasterArgs.PolicyArgs, flags, "")

 	BindImageFormatArgs(imageFormatArgs, flags, "")

-	BindKubeConnectionArgs(kubeConnectionArgs, flags, "")

 	BindCertArgs(certArgs, flags, "")

 	startMaster, _ := NewCommandStartMaster()

@@ -154,6 +153,14 @@ func (o AllInOneOptions) Validate(args []string) error {

 		return err

 	}

+	if err := o.NodeArgs.Validate(); err != nil {

+		return err

+	}

+

+	if len(o.MasterArgs.KubeConnectionArgs.ClientConfigLoadingRules.ExplicitPath) != 0 {

+		return errors.New("all-in-one cannot start against with a remote kubernetes, start just the master instead")

+	}

+

 	return nil

 }

@@ -165,8 +172,21 @@ func (o AllInOneOptions) Complete() error {

 	}

 	o.MasterArgs.NodeList = nodeList.List()

+	masterAddr, err := o.MasterArgs.GetMasterAddress()

+	if err != nil {

+		return nil

+	}

+	// in the all-in-one, default kubernetes URL to the master's address

+	o.NodeArgs.DefaultKubernetesURL = masterAddr

 	o.NodeArgs.NodeName = strings.ToLower(o.NodeArgs.NodeName)

+	// in the all-in-one, default ClusterDNS to the master's address

+	if host, _, err := net.SplitHostPort(masterAddr.Host); err == nil {

+		if ip := net.ParseIP(host); ip != nil {

+			o.NodeArgs.ClusterDNS = ip

+		}

+	}

+

 	return nil

 }

@@ -199,28 +219,11 @@ func (o AllInOneOptions) StartAllInOne() error {

 	}

 	masterOptions := MasterOptions{o.MasterArgs, o.WriteConfigOnly, o.MasterConfigFile}

-

-	masterAddr, err := masterOptions.MasterArgs.GetMasterAddress()

-	if err != nil {

-		return nil

-	}

-

-	// in the all-in-one, default kubernetes URL to the master's address

-	o.NodeArgs.DefaultKubernetesURL = *masterAddr

-

-	// in the all-in-one, default ClusterDNS to the master's address

-	if host, _, err := net.SplitHostPort(masterAddr.Host); err == nil {

-		if ip := net.ParseIP(host); ip != nil {

-			o.NodeArgs.ClusterDNS = ip

-		}

-	}

-

-	nodeOptions := NodeOptions{o.NodeArgs, o.WriteConfigOnly, o.NodeConfigFile}

-

 	if err := masterOptions.RunMaster(); err != nil {

 		return err

 	}

+	nodeOptions := NodeOptions{o.NodeArgs, o.WriteConfigOnly, o.NodeConfigFile}

 	if err := nodeOptions.RunNode(); err != nil {

 		return err

 	}

@@ -98,6 +98,10 @@ func (o NodeOptions) Validate(args []string) error {

 		}

 	}

+	if err := o.NodeArgs.Validate(); err != nil {

+		return err

+	}

+

 	return nil

 }

@@ -133,7 +137,7 @@ func (o NodeOptions) RunNode() error {

 	if mintCerts {

 		if err := o.CreateCerts(); err != nil {

-			return nil

+			return err

 		}

 	}

@@ -219,7 +223,7 @@ func (o NodeOptions) CreateCerts() error {

 		dnsIP = o.NodeArgs.ClusterDNS.String()

 	}

-	masterAddr, err := o.NodeArgs.KubeConnectionArgs.GetKubernetesAddress(&o.NodeArgs.DefaultKubernetesURL)

+	masterAddr, err := o.NodeArgs.KubeConnectionArgs.GetKubernetesAddress(o.NodeArgs.DefaultKubernetesURL)

 	if err != nil {

 		return err

 	}

@@ -12,7 +12,7 @@

           "ports": [{

               "containerPort": 8443,

           }],

-          "command": ["start", "master", "--kubernetes=:8443"],

+          "command": ["start", "master"],

           "imagePullPolicy": "PullIfNotPresent"

         }

       ],