Merge pull request #11120 from deads2k/oc-project-on-kube

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/cli/cmd/login/helpers.go

@@ -9,15 +9,17 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/openshift/origin/pkg/client"
-	"github.com/openshift/origin/pkg/user/api"
-	"k8s.io/kubernetes/pkg/client/restclient"
-	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
-
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
+	kapi "k8s.io/kubernetes/pkg/api"
+	kerrors "k8s.io/kubernetes/pkg/api/errors"
+	"k8s.io/kubernetes/pkg/client/restclient"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
+	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/term"
+
+	"github.com/openshift/origin/pkg/client"
+	"github.com/openshift/origin/pkg/user/api"
 )
 
 // getMatchingClusters examines the kubeconfig for all clusters that point to the same server
@@ -108,8 +110,25 @@ func getHostPort(hostURL string) (string, string, *url.URL, error) {
 	return host, port, parsedURL, err
 }
 
-func whoAmI(client *client.Client) (*api.User, error) {
+func whoAmI(clientConfig *restclient.Config) (*api.User, error) {
+	client, err := client.New(clientConfig)
+
 	me, err := client.Users().Get("~")
+
+	// if we're talking to kube (or likely talking to kube),
+	if kerrors.IsNotFound(err) {
+		switch {
+		case len(clientConfig.BearerToken) > 0:
+			// the user has already been willing to provide the token on the CLI, so they probably
+			// don't mind using it again if they switch to and from this user
+			return &api.User{ObjectMeta: kapi.ObjectMeta{Name: clientConfig.BearerToken}}, nil
+
+		case len(clientConfig.Username) > 0:
+			return &api.User{ObjectMeta: kapi.ObjectMeta{Name: clientConfig.Username}}, nil
+
+		}
+	}
+
 	if err != nil {
 		return nil, err
 	}

pkg/cmd/cli/cmd/login/loginoptions.go

@@ -173,21 +173,19 @@ func (o *LoginOptions) gatherAuthInfo() error {
 	// if a token were explicitly provided, try to use it
 	if o.tokenProvided() {
 		clientConfig.BearerToken = o.Token
-		if osClient, err := client.New(clientConfig); err == nil {
-			me, err := whoAmI(osClient)
-			if err == nil {
-				o.Username = me.Name
-				o.Config = clientConfig
-
-				fmt.Fprintf(o.Out, "Logged into %q as %q using the token provided.\n\n", o.Config.Host, o.Username)
-				return nil
-			}
+		if me, err := whoAmI(clientConfig); err == nil {
+			o.Username = me.Name
+			o.Config = clientConfig
+
+			fmt.Fprintf(o.Out, "Logged into %q as %q using the token provided.\n\n", o.Config.Host, o.Username)
+			return nil
 
-			if !kerrors.IsUnauthorized(err) {
-				return err
+		} else {
+			if kerrors.IsUnauthorized(err) {
+				return fmt.Errorf("The token provided is invalid or expired.\n\n")
 			}
 
-			return fmt.Errorf("The token provided is invalid or expired.\n\n")
+			return err
 		}
 	}
 
@@ -202,20 +200,18 @@ func (o *LoginOptions) gatherAuthInfo() error {
 			if matchingClusters.Has(context.Cluster) {
 				clientcmdConfig := kclientcmd.NewDefaultClientConfig(kubeconfig, &kclientcmd.ConfigOverrides{CurrentContext: key})
 				if kubeconfigClientConfig, err := clientcmdConfig.ClientConfig(); err == nil {
-					if osClient, err := client.New(kubeconfigClientConfig); err == nil {
-						if me, err := whoAmI(osClient); err == nil && (o.Username == me.Name) {
-							clientConfig.BearerToken = kubeconfigClientConfig.BearerToken
-							clientConfig.CertFile = kubeconfigClientConfig.CertFile
-							clientConfig.CertData = kubeconfigClientConfig.CertData
-							clientConfig.KeyFile = kubeconfigClientConfig.KeyFile
-							clientConfig.KeyData = kubeconfigClientConfig.KeyData
+					if me, err := whoAmI(kubeconfigClientConfig); err == nil && (o.Username == me.Name) {
+						clientConfig.BearerToken = kubeconfigClientConfig.BearerToken
+						clientConfig.CertFile = kubeconfigClientConfig.CertFile
+						clientConfig.CertData = kubeconfigClientConfig.CertData
+						clientConfig.KeyFile = kubeconfigClientConfig.KeyFile
+						clientConfig.KeyData = kubeconfigClientConfig.KeyData
 
-							o.Config = clientConfig
+						o.Config = clientConfig
 
-							fmt.Fprintf(o.Out, "Logged into %q as %q using existing credentials.\n\n", o.Config.Host, o.Username)
+						fmt.Fprintf(o.Out, "Logged into %q as %q using existing credentials.\n\n", o.Config.Host, o.Username)
 
-							return nil
-						}
+						return nil
 					}
 				}
 			}
@@ -234,12 +230,7 @@ func (o *LoginOptions) gatherAuthInfo() error {
 	}
 	clientConfig.BearerToken = token
 
-	osClient, err := client.New(clientConfig)
-	if err != nil {
-		return err
-	}
-
-	me, err := whoAmI(osClient)
+	me, err := whoAmI(clientConfig)
 	if err != nil {
 		return err
 	}
@@ -270,6 +261,12 @@ func (o *LoginOptions) gatherProjectInfo() error {
 	}
 
 	projectsList, err := oClient.Projects().List(kapi.ListOptions{})
+	// if we're running on kube (or likely kube), just set it to "default"
+	if kerrors.IsNotFound(err) {
+		fmt.Fprintf(o.Out, "Using \"default\".  You can switch projects with '%s project <projectname>':\n\n", o.CommandName)
+		o.Project = "default"
+		return nil
+	}
 	if err != nil {
 		return err
 	}
@@ -389,12 +386,7 @@ func (o *LoginOptions) SaveConfig() (bool, error) {
 }
 
 func (o LoginOptions) whoAmI() (*api.User, error) {
-	client, err := client.New(o.Config)
-	if err != nil {
-		return nil, err
-	}
-
-	return whoAmI(client)
+	return whoAmI(o.Config)
 }
 
 func (o *LoginOptions) usernameProvided() bool {

pkg/cmd/cli/cmd/login/logout.go

@@ -117,7 +117,7 @@ func (o LogoutOptions) RunLogout() error {
 		return err
 	}
 
-	userInfo, err := whoAmI(client)
+	userInfo, err := whoAmI(o.Config)
 	if err != nil {
 		return err
 	}

pkg/cmd/cli/cmd/project.go

@@ -9,6 +9,7 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	kapierrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/restclient"
+	kclient "k8s.io/kubernetes/pkg/client/unversioned"
 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -17,14 +18,15 @@ import (
 	cliconfig "github.com/openshift/origin/pkg/cmd/cli/config"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	"github.com/openshift/origin/pkg/project/api"
+	projectutil "github.com/openshift/origin/pkg/project/util"
 
 	"github.com/spf13/cobra"
 )
 
 type ProjectOptions struct {
 	Config       clientcmdapi.Config
 	ClientConfig *restclient.Config
-	ClientFn     func() (*client.Client, error)
+	ClientFn     func() (*client.Client, kclient.Interface, error)
 	Out          io.Writer
 	PathOptions  *kclientcmd.PathOptions
 
@@ -103,9 +105,8 @@ func (o *ProjectOptions) Complete(f *clientcmd.Factory, args []string, out io.Wr
 		return err
 	}
 
-	o.ClientFn = func() (*client.Client, error) {
-		client, _, err := f.Clients()
-		return client, err
+	o.ClientFn = func() (*client.Client, kclient.Interface, error) {
+		return f.Clients()
 	}
 
 	o.Out = out
@@ -136,18 +137,17 @@ func (o ProjectOptions) RunProject() error {
 				return nil
 			}
 
-			client, err := o.ClientFn()
+			client, kubeclient, err := o.ClientFn()
 			if err != nil {
 				return err
 			}
 
-			if _, err := client.Projects().Get(currentProject); err != nil {
-				if kapierrors.IsNotFound(err) {
-					return fmt.Errorf("the project %q specified in your config does not exist.", currentProject)
-				}
-				if clientcmd.IsForbidden(err) {
-					return fmt.Errorf("you do not have rights to view project %q.", currentProject)
-				}
+			switch err := confirmProjectAccess(currentProject, client, kubeclient); {
+			case clientcmd.IsForbidden(err):
+				return fmt.Errorf("you do not have rights to view project %q.", currentProject)
+			case kapierrors.IsNotFound(err):
+				return fmt.Errorf("the project %q specified in your config does not exist.", currentProject)
+			case err != nil:
 				return err
 			}
 
@@ -187,12 +187,12 @@ func (o ProjectOptions) RunProject() error {
 
 	} else {
 		if !o.SkipAccessValidation {
-			client, err := o.ClientFn()
+			client, kubeclient, err := o.ClientFn()
 			if err != nil {
 				return err
 			}
 
-			if _, err := client.Projects().Get(argument); err != nil {
+			if err := confirmProjectAccess(argument, client, kubeclient); err != nil {
 				if isNotFound, isForbidden := kapierrors.IsNotFound(err), clientcmd.IsForbidden(err); isNotFound || isForbidden {
 					var msg string
 					if isForbidden {
@@ -201,7 +201,7 @@ func (o ProjectOptions) RunProject() error {
 						msg = fmt.Sprintf("A project named %q does not exist on %q.", argument, clientCfg.Host)
 					}
 
-					projects, err := getProjects(client)
+					projects, err := getProjects(client, kubeclient)
 					if err == nil {
 						switch len(projects) {
 						case 0:
@@ -277,11 +277,35 @@ func (o ProjectOptions) RunProject() error {
 	return nil
 }
 
-func getProjects(oClient *client.Client) ([]api.Project, error) {
+func confirmProjectAccess(currentProject string, oClient *client.Client, kClient kclient.Interface) error {
+	_, projectErr := oClient.Projects().Get(currentProject)
+	if !kapierrors.IsNotFound(projectErr) {
+		return projectErr
+	}
+
+	// at this point we know the error is a not found, but we'll test namespaces just in case we're running on kube
+	if _, err := kClient.Namespaces().Get(currentProject); err == nil {
+		return nil
+	}
+
+	// otherwise return the openshift error default
+	return projectErr
+}
+
+func getProjects(oClient *client.Client, kClient kclient.Interface) ([]api.Project, error) {
 	projects, err := oClient.Projects().List(kapi.ListOptions{})
+	if err == nil {
+		return projects.Items, nil
+	}
+	if err != nil && !kapierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	namespaces, err := kClient.Namespaces().List(kapi.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
+	projects = projectutil.ConvertNamespaceList(namespaces)
 	return projects.Items, nil
 }
 

pkg/cmd/cli/cmd/projects.go

@@ -6,6 +6,7 @@ import (
 	"sort"
 
 	"k8s.io/kubernetes/pkg/client/restclient"
+	kclient "k8s.io/kubernetes/pkg/client/unversioned"
 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -22,6 +23,7 @@ type ProjectsOptions struct {
 	Config       clientcmdapi.Config
 	ClientConfig *restclient.Config
 	Client       *client.Client
+	KubeClient   kclient.Interface
 	Out          io.Writer
 	PathOptions  *kclientcmd.PathOptions
 
@@ -95,7 +97,7 @@ func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, commandN
 		return err
 	}
 
-	o.Client, _, err = f.Clients()
+	o.Client, o.KubeClient, err = f.Clients()
 	if err != nil {
 		return err
 	}
@@ -123,7 +125,7 @@ func (o ProjectsOptions) RunProjects() error {
 	client := o.Client
 
 	if len(currentProject) > 0 {
-		if _, currentProjectErr := client.Projects().Get(currentProject); currentProjectErr == nil {
+		if currentProjectErr := confirmProjectAccess(currentProject, o.Client, o.KubeClient); currentProjectErr == nil {
 			currentProjectExists = true
 		}
 	}
@@ -134,7 +136,7 @@ func (o ProjectsOptions) RunProjects() error {
 	}
 
 	var msg string
-	projects, err := getProjects(client)
+	projects, err := getProjects(client, o.KubeClient)
 	if err == nil {
 		switch len(projects) {
 		case 0: