From 30dc07d99cecae79beea1630cac25f1f98059ca9 Mon Sep 17 00:00:00 2001 From: John Collier Date: Thu, 28 May 2020 14:02:41 -0400 Subject: [PATCH 1/4] Don't show imagestreams error on experimental mode Signed-off-by: John Collier --- pkg/occlient/occlient.go | 4 ++++ pkg/odo/cli/component/create.go | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/occlient/occlient.go b/pkg/occlient/occlient.go index 82e29b7b76e..ff80fc513aa 100644 --- a/pkg/occlient/occlient.go +++ b/pkg/occlient/occlient.go @@ -23,6 +23,7 @@ import ( "github.com/openshift/odo/pkg/config" "github.com/openshift/odo/pkg/devfile/adapters/common" "github.com/openshift/odo/pkg/log" + "github.com/openshift/odo/pkg/odo/util/experimental" "github.com/openshift/odo/pkg/preference" "github.com/openshift/odo/pkg/util" @@ -374,6 +375,9 @@ func (c *Client) GetPortsFromBuilderImage(componentType string) ([]string, error } imageStream, err := c.GetImageStream(imageNS, imageName, imageTag) if err != nil { + if experimental.IsExperimentalModeEnabled() { + return []string{}, fmt.Errorf("component \"%s\" not found", componentType) + } return []string{}, err } imageStreamImage, err := c.GetImageStreamImage(imageStream, imageTag) diff --git a/pkg/odo/cli/component/create.go b/pkg/odo/cli/component/create.go index 068901dedf2..dfe2e0cfd70 100644 --- a/pkg/odo/cli/component/create.go +++ b/pkg/odo/cli/component/create.go @@ -474,9 +474,15 @@ func (co *CreateOptions) Complete(name string, cmd *cobra.Command, args []string return errors.Wrap(err, "failed intiating local config") } - // Do not execute S2I specific code on Kubernetes Cluster + // Do not execute S2I specific code on Kubernetes Cluster or Docker // return from here, if it is not an openshift cluster. - openshiftCluster, _ := co.Client.IsImageStreamSupported() + var openshiftCluster bool + if !pushtarget.IsPushTargetDocker() { + openshiftCluster, _ = co.Client.IsImageStreamSupported() + } else { + openshiftCluster = false + } + openshiftCluster, _ = co.Client.IsImageStreamSupported() if !openshiftCluster { return errors.New("component not found") } From a8905b31a01d6cc69f04277fc8422baf5bac1b81 Mon Sep 17 00:00:00 2001 From: John Collier Date: Thu, 28 May 2020 14:42:43 -0400 Subject: [PATCH 2/4] Remove unnecessary line Signed-off-by: John Collier --- pkg/odo/cli/component/create.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/odo/cli/component/create.go b/pkg/odo/cli/component/create.go index dfe2e0cfd70..e4e0dd07b91 100644 --- a/pkg/odo/cli/component/create.go +++ b/pkg/odo/cli/component/create.go @@ -482,7 +482,6 @@ func (co *CreateOptions) Complete(name string, cmd *cobra.Command, args []string } else { openshiftCluster = false } - openshiftCluster, _ = co.Client.IsImageStreamSupported() if !openshiftCluster { return errors.New("component not found") } From 8e562c7d637acaf5148ab54d05cfecea4ab535ef Mon Sep 17 00:00:00 2001 From: John Collier Date: Fri, 29 May 2020 00:53:23 -0400 Subject: [PATCH 3/4] Move where error message printed Signed-off-by: John Collier --- pkg/occlient/occlient.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/occlient/occlient.go b/pkg/occlient/occlient.go index ff80fc513aa..14199311ebf 100644 --- a/pkg/occlient/occlient.go +++ b/pkg/occlient/occlient.go @@ -375,9 +375,6 @@ func (c *Client) GetPortsFromBuilderImage(componentType string) ([]string, error } imageStream, err := c.GetImageStream(imageNS, imageName, imageTag) if err != nil { - if experimental.IsExperimentalModeEnabled() { - return []string{}, fmt.Errorf("component \"%s\" not found", componentType) - } return []string{}, err } imageStreamImage, err := c.GetImageStreamImage(imageStream, imageTag) @@ -757,6 +754,9 @@ func (c *Client) GetImageStream(imageNS string, imageName string, imageTag strin } if e != nil && err != nil { // Imagestream not found in openshift and current namespaces + if experimental.IsExperimentalModeEnabled() { + return nil, fmt.Errorf("component \"%s\" not found", imageName) + } return nil, err } From 6465d4a6cded10c5f99848e0de0d7f9c55fcc217 Mon Sep 17 00:00:00 2001 From: John Collier Date: Fri, 29 May 2020 10:31:20 -0400 Subject: [PATCH 4/4] Use %q instead Signed-off-by: John Collier --- pkg/occlient/occlient.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/occlient/occlient.go b/pkg/occlient/occlient.go index 14199311ebf..62605768390 100644 --- a/pkg/occlient/occlient.go +++ b/pkg/occlient/occlient.go @@ -755,7 +755,7 @@ func (c *Client) GetImageStream(imageNS string, imageName string, imageTag strin if e != nil && err != nil { // Imagestream not found in openshift and current namespaces if experimental.IsExperimentalModeEnabled() { - return nil, fmt.Errorf("component \"%s\" not found", imageName) + return nil, fmt.Errorf("component %q not found", imageName) } return nil, err }