alihan/odo
1
0
Fork 0
mirror of https://github.com/redhat-developer/odo.git synced 2025-10-19 03:06:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove kubeconfig flag (#7017)

Browse Source 
* Remove kubeconfig flag

* Do not check file exists from KUBECONFIG, as KUBECONFIG can be a list of files and this is done by clientcmd library

* Fix odo --help

* Add integration test to check flag is not supported
This commit is contained in:
Philippe Martin
2023-08-04 11:52:19 +02:00
committed by GitHub
parent 1c6767ee37
commit 7c976f1bf1
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/odo/odo.go
View File

@@ -25,6 +25,10 @@ import (
)
func main() {
// We need to reinitialize this global variable in case flags are defined by third-party packages
// (for example vendor/sigs.k8s.io/controller-runtime/pkg/client/config/config.go)
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
// Create a context ready for receiving telemetry data
// and save into it configuration based on environment variables
ctx := segment.NewContext(context.Background())
@@ -54,8 +58,9 @@ func main() {
// add the completion flags to the root command, though they won't appear in completions
root.Flags().AddGoFlagSet(flag.CommandLine)
// override usage so that flag.Parse uses root command's usage instead of default one when invoked with -h
flag.Usage = func() {
flag.CommandLine.Usage = func() {
_ = root.Help()
}

12
pkg/odo/cli/list/list.go
View File

@@ -2,7 +2,6 @@ package list
import (
"context"
"errors"
"fmt"
"github.com/spf13/cobra"
@@ -24,8 +23,6 @@ import (
"github.com/redhat-developer/odo/pkg/odo/util"
odoutil "github.com/redhat-developer/odo/pkg/odo/util"
dfutil "github.com/devfile/library/v2/pkg/util"
ktemplates "k8s.io/kubectl/pkg/util/templates"
)
@@ -62,15 +59,6 @@ func (o *ListOptions) SetClientset(clientset *clientset.Clientset) {
// Complete ...
func (lo *ListOptions) Complete(ctx context.Context, cmdline cmdline.Cmdline, args []string) (err error) {
// Check to see if KUBECONFIG exists, and if not, error the user that we would not be able to get cluster information
// Do this before anything else, or else we will just error out with the:
// invalid configuration: no configuration has been provided, try setting KUBERNETES_MASTER environment variable
// instead
if !dfutil.CheckKubeConfigExist() {
return errors.New("KUBECONFIG not found. Unable to retrieve cluster information. Please set your Kubernetes configuration via KUBECONFIG env variable or ~/.kube/config")
}
// If the namespace flag has been passed, we will search there.
// if it hasn't, we will search from the default project / namespace.
if lo.namespaceFlag != "" {

7
tests/integration/generic_test.go
View File

@@ -35,10 +35,13 @@ var _ = Describe("odo generic", func() {
BeforeEach(func() {
output = helper.Cmd("odo", "--help").ShouldPass().Out()
})
It("retuns full help contents including usage, examples, commands, utility commands, component shortcuts, and flags sections", func() {
It("returns full help contents including usage, examples, commands, utility commands, component shortcuts, and flags sections", func() {
helper.MatchAllInOutput(output, []string{"Usage:", "Examples:", "Main Commands:", "OpenShift Commands:", "Utility Commands:", "Flags:"})
helper.DontMatchAllInOutput(output, []string{"--kubeconfig"})
})
It("does not support the --kubeconfig flag", func() {
helper.DontMatchAllInOutput(output, []string{"--kubeconfig"})
})
})
When("running odo without subcommand and flags", func() {