Skip to content

Commit a961155

Browse files
cdragecdrage
committed
Make Devfile the default deployment mechanism for odo 2.0.0
**What type of PR is this?** > Uncomment only one ` /kind` line, and delete the rest. > For example, `> /kind bug` would simply become: `/kind bug` /kind feature **What does does this PR do / why we need it**: Makes Devfile the default deployment mechanism, removing S2I in favour of Devfile deployment. **Which issue(s) this PR fixes**: redhat-developer#3550 **How to test changes / Special notes to the reviewer**: Run: ```sh odo preference set experimental false odo create --starter nodejs odo push ``` And it should deploy devfile.
1 parent 378f4b8 commit a961155

31 files changed

+1142
-1175
lines changed

‎pkg/component/component.go

+14-20
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/openshift/odo/pkg/exec"
2626
"github.com/openshift/odo/pkg/log"
2727
"github.com/openshift/odo/pkg/occlient"
28-
"github.com/openshift/odo/pkg/odo/util/experimental"
2928
"github.com/openshift/odo/pkg/odo/util/validation"
3029
"github.com/openshift/odo/pkg/preference"
3130
"github.com/openshift/odo/pkg/storage"
@@ -545,7 +544,6 @@ func ValidateComponentCreateRequest(client *occlient.Client, componentSettings c
545544
// Returns:
546545
// err: Errors if any else nil
547546
func ApplyConfig(client *occlient.Client, kClient *kclient.Client, componentConfig config.LocalConfigInfo, envSpecificInfo envinfo.EnvSpecificInfo, stdout io.Writer, cmpExist bool) (err error) {
548-
isExperimentalModeEnabled := experimental.IsExperimentalModeEnabled()
549547

550548
if client == nil {
551549
var err error
@@ -556,23 +554,20 @@ func ApplyConfig(client *occlient.Client, kClient *kclient.Client, componentConf
556554
client.Namespace = envSpecificInfo.GetNamespace()
557555
}
558556

559-
if !isExperimentalModeEnabled {
560-
// if component exist then only call the update function
561-
if cmpExist {
562-
if err = Update(client, componentConfig, componentConfig.GetSourceLocation(), stdout); err != nil {
563-
return err
564-
}
557+
// if component exist then only call the update function
558+
if cmpExist {
559+
if err = Update(client, componentConfig, componentConfig.GetSourceLocation(), stdout); err != nil {
560+
return err
565561
}
566562
}
567563

568564
var componentName string
569565
var applicationName string
570-
if !isExperimentalModeEnabled || kClient == nil {
571-
componentName = componentConfig.GetName()
572-
applicationName = componentConfig.GetApplication()
573-
} else {
574-
componentName = envSpecificInfo.GetName()
575-
}
566+
// Devfile
567+
componentName = componentConfig.GetName()
568+
applicationName = componentConfig.GetApplication()
569+
// NOTE: This used to be an if statement, use this for s2i only:
570+
componentName = envSpecificInfo.GetName()
576571

577572
isRouteSupported := false
578573
isRouteSupported, err = client.IsRouteSupported()
@@ -581,12 +576,11 @@ func ApplyConfig(client *occlient.Client, kClient *kclient.Client, componentConf
581576
}
582577

583578
return urlpkg.Push(client, kClient, urlpkg.PushParameters{
584-
ComponentName: componentName,
585-
ApplicationName: applicationName,
586-
ConfigURLs: componentConfig.GetURL(),
587-
EnvURLS: envSpecificInfo.GetURL(),
588-
IsRouteSupported: isRouteSupported,
589-
IsExperimentalModeEnabled: isExperimentalModeEnabled,
579+
ComponentName: componentName,
580+
ApplicationName: applicationName,
581+
ConfigURLs: componentConfig.GetURL(),
582+
EnvURLS: envSpecificInfo.GetURL(),
583+
IsRouteSupported: isRouteSupported,
590584
})
591585
}
592586

‎pkg/component/component_full_description.go

+10-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/openshift/odo/pkg/config"
99
"github.com/openshift/odo/pkg/log"
1010
"github.com/openshift/odo/pkg/occlient"
11-
"github.com/openshift/odo/pkg/odo/util/experimental"
1211
"github.com/openshift/odo/pkg/storage"
1312
urlpkg "github.com/openshift/odo/pkg/url"
1413
corev1 "k8s.io/api/core/v1"
@@ -190,20 +189,18 @@ func (cfd *ComponentFullDescription) Print(client *occlient.Client) error {
190189
if len(cfd.Spec.URL.Items) > 0 {
191190
var output string
192191

193-
if !experimental.IsExperimentalModeEnabled() {
194-
// if the component is not pushed
195-
for i, componentURL := range cfd.Spec.URL.Items {
196-
if componentURL.Status.State == urlpkg.StateTypePushed {
197-
output += fmt.Sprintf(" · %v exposed via %v\n", urlpkg.GetURLString(componentURL.Spec.Protocol, componentURL.Spec.Host, "", experimental.IsExperimentalModeEnabled()), componentURL.Spec.Port)
192+
// if the component is not pushed
193+
for i, componentURL := range cfd.Spec.URL.Items {
194+
if componentURL.Status.State == urlpkg.StateTypePushed {
195+
output += fmt.Sprintf(" · %v exposed via %v\n", urlpkg.GetURLString(componentURL.Spec.Protocol, componentURL.Spec.Host, ""), componentURL.Spec.Port)
196+
} else {
197+
var p string
198+
if i >= len(cfd.Spec.Ports) {
199+
p = cfd.Spec.Ports[len(cfd.Spec.Ports)-1]
198200
} else {
199-
var p string
200-
if i >= len(cfd.Spec.Ports) {
201-
p = cfd.Spec.Ports[len(cfd.Spec.Ports)-1]
202-
} else {
203-
p = cfd.Spec.Ports[i]
204-
}
205-
output += fmt.Sprintf(" · URL named %s will be exposed via %v\n", componentURL.Name, p)
201+
p = cfd.Spec.Ports[i]
206202
}
203+
output += fmt.Sprintf(" · URL named %s will be exposed via %v\n", componentURL.Name, p)
207204
}
208205
}
209206
// Cut off the last newline and output

‎pkg/occlient/occlient.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/openshift/odo/pkg/config"
2323
"github.com/openshift/odo/pkg/devfile/adapters/common"
2424
"github.com/openshift/odo/pkg/log"
25-
"github.com/openshift/odo/pkg/odo/util/experimental"
2625
"github.com/openshift/odo/pkg/preference"
2726
"github.com/openshift/odo/pkg/util"
2827

@@ -751,11 +750,7 @@ func (c *Client) GetImageStream(imageNS string, imageName string, imageTag strin
751750
}
752751
}
753752
if e != nil && err != nil {
754-
// Imagestream not found in openshift and current namespaces
755-
if experimental.IsExperimentalModeEnabled() {
756-
return nil, fmt.Errorf("component type %q not found", imageName)
757-
}
758-
return nil, err
753+
return nil, fmt.Errorf("component type %q not found", imageName)
759754
}
760755

761756
// Required tag not in openshift and current namespaces

‎pkg/odo/cli/catalog/describe/component.go

+52-54
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/openshift/odo/pkg/log"
1212
"github.com/openshift/odo/pkg/machineoutput"
1313
"github.com/openshift/odo/pkg/odo/genericclioptions"
14-
"github.com/openshift/odo/pkg/odo/util/experimental"
1514
"github.com/openshift/odo/pkg/odo/util/pushtarget"
1615
"github.com/openshift/odo/pkg/util"
1716
pkgUtil "github.com/openshift/odo/pkg/util"
@@ -61,11 +60,14 @@ func (o *DescribeComponentOptions) Complete(name string, cmd *cobra.Command, arg
6160
tasks.Add(util.ConcurrentTask{ToRun: func(errChannel chan error) {
6261
catalogList, err := catalog.ListComponents(o.Client)
6362
if err != nil {
64-
if experimental.IsExperimentalModeEnabled() {
65-
klog.V(4).Info("Please log in to an OpenShift cluster to list OpenShift/s2i components")
66-
} else {
67-
errChannel <- err
68-
}
63+
klog.V(4).Info("Please log in to an OpenShift cluster to list OpenShift/s2i components")
64+
65+
// S2I Only
66+
/*
67+
} else {
68+
errChannel <- err
69+
}
70+
*/
6971
}
7072
for _, image := range catalogList.Items {
7173
if image.Name == o.componentName {
@@ -75,18 +77,16 @@ func (o *DescribeComponentOptions) Complete(name string, cmd *cobra.Command, arg
7577
}})
7678
}
7779

78-
if experimental.IsExperimentalModeEnabled() {
79-
tasks.Add(util.ConcurrentTask{ToRun: func(errChannel chan error) {
80-
catalogDevfileList, err := catalog.ListDevfileComponents("")
81-
if catalogDevfileList.DevfileRegistries == nil {
82-
log.Warning("Please run 'odo registry add <registry name> <registry URL>' to add registry for listing devfile components\n")
83-
}
84-
if err != nil {
85-
errChannel <- err
86-
}
87-
o.GetDevfileComponentsByName(catalogDevfileList)
88-
}})
89-
}
80+
tasks.Add(util.ConcurrentTask{ToRun: func(errChannel chan error) {
81+
catalogDevfileList, err := catalog.ListDevfileComponents("")
82+
if catalogDevfileList.DevfileRegistries == nil {
83+
log.Warning("Please run 'odo registry add <registry name> <registry URL>' to add registry for listing devfile components\n")
84+
}
85+
if err != nil {
86+
errChannel <- err
87+
}
88+
o.GetDevfileComponentsByName(catalogDevfileList)
89+
}})
9090

9191
return tasks.Run()
9292
}
@@ -102,50 +102,48 @@ func (o *DescribeComponentOptions) Validate() (err error) {
102102

103103
// Run contains the logic for the command associated with DescribeComponentOptions
104104
func (o *DescribeComponentOptions) Run() (err error) {
105-
if experimental.IsExperimentalModeEnabled() {
106-
w := tabwriter.NewWriter(os.Stdout, 5, 2, 3, ' ', tabwriter.TabIndent)
107-
if log.IsJSON() {
108-
if len(o.devfileComponents) > 0 {
109-
for _, devfileComponent := range o.devfileComponents {
110-
devObj, err := GetDevfile(devfileComponent)
111-
if err != nil {
112-
return err
113-
}
114-
115-
machineoutput.OutputSuccess(devObj)
105+
w := tabwriter.NewWriter(os.Stdout, 5, 2, 3, ' ', tabwriter.TabIndent)
106+
if log.IsJSON() {
107+
if len(o.devfileComponents) > 0 {
108+
for _, devfileComponent := range o.devfileComponents {
109+
devObj, err := GetDevfile(devfileComponent)
110+
if err != nil {
111+
return err
116112
}
113+
114+
machineoutput.OutputSuccess(devObj)
117115
}
118-
} else {
119-
if len(o.devfileComponents) > 1 {
120-
log.Warningf("There are multiple components named \"%s\" in different multiple devfile registries.\n", o.componentName)
121-
}
122-
if len(o.devfileComponents) > 0 {
123-
fmt.Fprintln(w, "Devfile Component(s):")
116+
}
117+
} else {
118+
if len(o.devfileComponents) > 1 {
119+
log.Warningf("There are multiple components named \"%s\" in different multiple devfile registries.\n", o.componentName)
120+
}
121+
if len(o.devfileComponents) > 0 {
122+
fmt.Fprintln(w, "Devfile Component(s):")
124123

125-
for _, devfileComponent := range o.devfileComponents {
126-
fmt.Fprintln(w, "\n* Registry: "+devfileComponent.Registry.Name)
124+
for _, devfileComponent := range o.devfileComponents {
125+
fmt.Fprintln(w, "\n* Registry: "+devfileComponent.Registry.Name)
127126

128-
devObj, err := GetDevfile(devfileComponent)
129-
if err != nil {
130-
return err
131-
}
127+
devObj, err := GetDevfile(devfileComponent)
128+
if err != nil {
129+
return err
130+
}
132131

133-
projects := devObj.Data.GetProjects()
134-
// only print project info if there is at least one project in the devfile
135-
err = o.PrintDevfileProjects(w, projects, devObj)
136-
if err != nil {
137-
return err
138-
}
132+
projects := devObj.Data.GetProjects()
133+
// only print project info if there is at least one project in the devfile
134+
err = o.PrintDevfileProjects(w, projects, devObj)
135+
if err != nil {
136+
return err
139137
}
140-
} else {
141-
fmt.Fprintln(w, "There are no Odo devfile components with the name \""+o.componentName+"\"")
142138
}
143-
if o.component != "" {
144-
fmt.Fprintln(w, "\nS2I Based Components:")
145-
fmt.Fprintln(w, "-"+o.component)
146-
}
147-
fmt.Fprintln(w)
139+
} else {
140+
fmt.Fprintln(w, "There are no Odo devfile components with the name \""+o.componentName+"\"")
141+
}
142+
if o.component != "" {
143+
fmt.Fprintln(w, "\nS2I Based Components:")
144+
fmt.Fprintln(w, "-"+o.component)
148145
}
146+
fmt.Fprintln(w)
149147
}
150148

151149
return nil

‎pkg/odo/cli/catalog/describe/service.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package describe
22

33
import (
44
"fmt"
5+
"os"
6+
"strings"
7+
58
"github.com/olekukonko/tablewriter"
69
"github.com/openshift/odo/pkg/odo/genericclioptions"
710
svc "github.com/openshift/odo/pkg/service"
811
"github.com/spf13/cobra"
912
ktemplates "k8s.io/kubectl/pkg/util/templates"
10-
"os"
11-
"strings"
1213
)
1314

1415
const serviceRecommendedCommandName = "service"

‎pkg/odo/cli/catalog/list/components.go

+22-29
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/openshift/odo/pkg/machineoutput"
1313
catalogutil "github.com/openshift/odo/pkg/odo/cli/catalog/util"
1414
"github.com/openshift/odo/pkg/odo/genericclioptions"
15-
"github.com/openshift/odo/pkg/odo/util/experimental"
1615
"github.com/openshift/odo/pkg/odo/util/pushtarget"
1716
"github.com/openshift/odo/pkg/util"
1817
"github.com/spf13/cobra"
@@ -51,28 +50,24 @@ func (o *ListComponentsOptions) Complete(name string, cmd *cobra.Command, args [
5150
tasks.Add(util.ConcurrentTask{ToRun: func(errChannel chan error) {
5251
o.catalogList, err = catalog.ListComponents(o.Client)
5352
if err != nil {
54-
if experimental.IsExperimentalModeEnabled() {
55-
klog.V(4).Info("Please log in to an OpenShift cluster to list OpenShift/s2i components")
56-
} else {
57-
errChannel <- err
58-
}
53+
klog.V(4).Info("Please log in to an OpenShift cluster to list OpenShift/s2i components")
54+
// S2I Only
55+
// errChannel <- err
5956
} else {
6057
o.catalogList.Items = catalogutil.FilterHiddenComponents(o.catalogList.Items)
6158
}
6259
}})
6360
}
6461

65-
if experimental.IsExperimentalModeEnabled() {
66-
tasks.Add(util.ConcurrentTask{ToRun: func(errChannel chan error) {
67-
o.catalogDevfileList, err = catalog.ListDevfileComponents("")
68-
if o.catalogDevfileList.DevfileRegistries == nil {
69-
log.Warning("Please run 'odo registry add <registry name> <registry URL>' to add registry for listing devfile components\n")
70-
}
71-
if err != nil {
72-
errChannel <- err
73-
}
74-
}})
75-
}
62+
tasks.Add(util.ConcurrentTask{ToRun: func(errChannel chan error) {
63+
o.catalogDevfileList, err = catalog.ListDevfileComponents("")
64+
if o.catalogDevfileList.DevfileRegistries == nil {
65+
log.Warning("Please run 'odo registry add <registry name> <registry URL>' to add registry for listing devfile components\n")
66+
}
67+
if err != nil {
68+
errChannel <- err
69+
}
70+
}})
7671

7772
return tasks.Run()
7873
}
@@ -101,19 +96,17 @@ func (o *ListComponentsOptions) Run() (err error) {
10196
supported, _ := catalog.SliceSupportedTags(image)
10297
o.catalogList.Items[i].Spec.SupportedTags = supported
10398
}
104-
if experimental.IsExperimentalModeEnabled() {
105-
combinedList := combinedCatalogList{
106-
TypeMeta: metav1.TypeMeta{
107-
Kind: "List",
108-
APIVersion: "odo.dev/v1alpha1",
109-
},
110-
S2iItems: o.catalogList.Items,
111-
DevfileItems: o.catalogDevfileList.Items,
112-
}
113-
machineoutput.OutputSuccess(combinedList)
114-
} else {
115-
machineoutput.OutputSuccess(o.catalogList)
99+
combinedList := combinedCatalogList{
100+
TypeMeta: metav1.TypeMeta{
101+
Kind: "List",
102+
APIVersion: "odo.dev/v1alpha1",
103+
},
104+
S2iItems: o.catalogList.Items,
105+
DevfileItems: o.catalogDevfileList.Items,
116106
}
107+
machineoutput.OutputSuccess(combinedList)
108+
// S2I Only
109+
// machineoutput.OutputSuccess(o.catalogList)
117110
} else {
118111
w := tabwriter.NewWriter(os.Stdout, 5, 2, 3, ' ', tabwriter.TabIndent)
119112
var supCatalogList, unsupCatalogList []catalog.ComponentType

‎pkg/odo/cli/catalog/list/list.go

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package list
22

33
import (
44
"fmt"
5+
56
"github.com/openshift/odo/pkg/odo/util"
67
"github.com/spf13/cobra"
78
)

0 commit comments

Comments
 (0)