make odo catalog list components work outside of experimental mode #3669

girishramnani · 2020-07-31T10:01:48Z

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 api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind failing-test

/kind feature

What does does this PR do / why we need it:
make odo catalog list components work outside of experimental mode

Which issue(s) this PR fixes:

Works towards experimental mode

PR acceptance criteria:

Unit test
Integration test
Documentation

How to test changes / Special notes to the reviewer:

odo catalog list components 
odo catalog list components -o json

both should work with openshift and kube cluster outside of experimental mode

girishramnani · 2020-07-31T10:46:46Z

output against local minikube

(base) girish@MacBook-Pro odo % odo catalog list components           
Odo Devfile Components:
NAME                 DESCRIPTION                            REGISTRY
java-maven           Upstream Maven and OpenJDK 11          DefaultDevfileRegistry
java-openliberty     Open Liberty microservice in Java      DefaultDevfileRegistry
java-quarkus         Upstream Quarkus with Java+GraalVM     DefaultDevfileRegistry
java-springboot      Spring Boot® using Java                DefaultDevfileRegistry
nodejs               Stack with NodeJS 12                   DefaultDevfileRegistry

output against crc

(base) girish@MacBook-Pro odo % odo catalog list components
Odo OpenShift Components:
NAME              PROJECT       TAGS                   SUPPORTED
java              openshift     11,8,latest            YES
nodejs            openshift     10-SCL,latest          YES
dotnet            openshift     2.1,2.2,3.0,latest     NO
golang            openshift     1.11.5,latest          NO
httpd             openshift     2.4,latest             NO
modern-webapp     openshift     10.x,latest            NO
nginx             openshift     1.10,1.12,latest       NO
nodejs            openshift     8,8-RHOAR              NO
perl              openshift     5.24,5.26,latest       NO
php               openshift     7.0,7.1,7.2,latest     NO
python            openshift     2.7,3.6,latest         NO
ruby              openshift     2.4,2.5,latest         NO

Odo Devfile Components:
NAME                 DESCRIPTION                            REGISTRY
java-maven           Upstream Maven and OpenJDK 11          DefaultDevfileRegistry
java-openliberty     Open Liberty microservice in Java      DefaultDevfileRegistry
java-quarkus         Upstream Quarkus with Java+GraalVM     DefaultDevfileRegistry
java-springboot      Spring Boot® using Java                DefaultDevfileRegistry
nodejs               Stack with NodeJS 12                   DefaultDevfileRegistry

kadel · 2020-07-31T11:15:32Z

while we are modifying this it might be a good idea to switch the order in odo catalog lists components to first list devfile components

dharmit · 2020-07-31T11:25:14Z

Should it require a connection with k8s/ocp cluster?

$ odo catalog list components
 ✗  invalid configuration: no configuration has been provided
Please login to your server: 

odo login https://mycluster.mydomain.com

Don't we just fetch the info from registry?

kadel · 2020-07-31T11:28:19Z

Should it require a connection with k8s/ocp cluster?
$ odo catalog list components
 ✗  invalid configuration: no configuration has been provided
Please login to your server: 

odo login https://mycluster.mydomain.com
Don't we just fetch the info from registry?

good point. We definitely should not fail. We could just siletly ignore this error, or just print warning.

girishramnani · 2020-07-31T11:30:08Z

Changing

girishramnani · 2020-07-31T11:44:16Z

Done @kadel @dharmit

cdrage · 2020-07-31T14:34:11Z

Still shows s2i as the first one not Devfile.

Otherwise, code LGTM!

github.com/openshift/odo  pr_3669 ✔                                                                                                                                                                                                                                                                                                                                  2h51m  
▶ odo catalog list components
Odo OpenShift Components:
NAME              PROJECT       TAGS                   SUPPORTED
java              openshift     11,8,latest            YES
nodejs            openshift     10-SCL,latest          YES
dotnet            openshift     2.1,2.2,3.0,latest     NO
golang            openshift     1.11.5,latest          NO
httpd             openshift     2.4,latest             NO
modern-webapp     openshift     10.x,latest            NO
nginx             openshift     1.10,1.12,latest       NO
nodejs            openshift     8,8-RHOAR              NO
perl              openshift     5.24,5.26,latest       NO
php               openshift     7.0,7.1,7.2,latest     NO
python            openshift     2.7,3.6,latest         NO
ruby              openshift     2.4,2.5,latest         NO

Odo Devfile Components:
NAME                 DESCRIPTION                            REGISTRY
java-maven           Upstream Maven and OpenJDK 11          DefaultDevfileRegistry
java-openliberty     Open Liberty microservice in Java      DefaultDevfileRegistry
java-quarkus         Upstream Quarkus with Java+GraalVM     DefaultDevfileRegistry
java-springboot      Spring Boot® using Java                DefaultDevfileRegistry
nodejs               Stack with NodeJS 12                   DefaultDevfileRegistry

/approve

openshift-ci-robot · 2020-07-31T14:34:28Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cdrage

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/catalog/OWNERS~~ [cdrage]
~~pkg/odo/cli/catalog/OWNERS~~ [cdrage]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

girishramnani · 2020-07-31T14:57:27Z

Done

cdrage · 2020-07-31T14:58:06Z

LGTM!

github.com/openshift/odo  pr_3669 ✗                                                                                                                                                                                                                                                                                                                                   1m ◒  
▶ odo catalog list components
Odo Devfile Components:
NAME                 DESCRIPTION                            REGISTRY
java-maven           Upstream Maven and OpenJDK 11          DefaultDevfileRegistry
java-openliberty     Open Liberty microservice in Java      DefaultDevfileRegistry
java-quarkus         Upstream Quarkus with Java+GraalVM     DefaultDevfileRegistry
java-springboot      Spring Boot® using Java                DefaultDevfileRegistry
nodejs               Stack with NodeJS 12                   DefaultDevfileRegistry

Odo OpenShift Components:
NAME              PROJECT       TAGS                   SUPPORTED
java              openshift     11,8,latest            YES
nodejs            openshift     10-SCL,latest          YES
dotnet            openshift     2.1,2.2,3.0,latest     NO
golang            openshift     1.11.5,latest          NO
httpd             openshift     2.4,latest             NO
modern-webapp     openshift     10.x,latest            NO
nginx             openshift     1.10,1.12,latest       NO
nodejs            openshift     8,8-RHOAR              NO
perl              openshift     5.24,5.26,latest       NO
php               openshift     7.0,7.1,7.2,latest     NO
python            openshift     2.7,3.6,latest         NO
ruby              openshift     2.4,2.5,latest         NO

devang-gaur

minor changes suggested. everything else lgtm

devang-gaur · 2020-07-31T15:20:03Z

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

+			fmt.Fprintln(w, "Odo Devfile Components:")
+			fmt.Fprintln(w, "NAME", "\t", "DESCRIPTION", "\t", "REGISTRY")
+
+			o.printDevfileCatalogList(w, o.catalogDevfileList.Items, "")


Can you put these lines

fmt.Fprintln(w, "Odo Devfile Components:") fmt.Fprintln(w, "NAME", "\t", "DESCRIPTION", "\t", "REGISTRY")

inside o.printDevfileCatalogList( .. .) method?

Same for the S2i components case, o.printCatalogList( ... ) method.

devang-gaur · 2020-07-31T15:20:09Z

pkg/catalog/catalog.go

@@ -200,6 +200,7 @@ func ListComponents(client *occlient.Client) (ComponentTypeList, error) {
 		},
 		Items: catalogList,
 	}, nil
+


can you remove this unnecessary newline added?

cdrage · 2020-07-31T15:55:54Z

New code LGTM. We could address @dev-gaur 's comments after. Going to

/lgtm

for now and see if it'll merge.

openshift-bot · 2020-07-31T18:03:48Z

/retest

Please review the full test history for this PR and help us cut down flakes.

cdrage · 2020-07-31T20:05:37Z

/retest

girishramnani · 2020-07-31T21:40:29Z

/retest

openshift-bot · 2020-08-01T06:17:32Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-01T06:24:46Z

/retest

Please review the full test history for this PR and help us cut down flakes.

codecov · 2020-08-01T09:28:27Z

Codecov Report

Merging #3669 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3669   +/-   ##
=======================================
  Coverage   44.62%   44.62%           
=======================================
  Files         124      124           
  Lines       12524    12524           
=======================================
  Hits         5589     5589           
  Misses       6384     6384           
  Partials      551      551

Impacted Files	Coverage Δ
pkg/catalog/catalog.go	`53.74% <ø> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c2956ce...a380ccd. Read the comment docs.

openshift-bot · 2020-08-01T16:48:45Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-01T17:01:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-01T18:45:47Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T10:34:40Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T10:47:44Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T11:00:48Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T11:39:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T12:18:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T12:31:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T12:45:24Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T12:57:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T13:10:43Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T13:23:50Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T13:36:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T13:49:37Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-02T14:28:39Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T00:45:47Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T01:28:02Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T01:31:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T03:28:38Z

/retest

Please review the full test history for this PR and help us cut down flakes.

kadel · 2020-08-03T08:02:12Z

/retest

openshift-bot · 2020-08-03T15:35:53Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T16:41:13Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T19:55:58Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T20:21:59Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T23:23:56Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-08-03T23:36:57Z

/retest

Please review the full test history for this PR and help us cut down flakes.

* Adds documentation on Devfile file reference (#3487) **What type of PR is this?** > Uncomment only one ` /kind` line, and delete the rest. > For example, `> /kind bug` would simply become: `/kind bug` > Documentation changes: Please include [skip ci] in your commit message as well /kind documentation [skip ci] **What does does this PR do / why we need it**: This PR adds documentation regarding each section of Devfile and what we support / do not support **Which issue(s) this PR fixes**: N/A **How to test changes / Special notes to the reviewer**: N/A Signed-off-by: Charlie Drage <charlie@charliedrage.com> * Update file reference documentation (#3675) **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 documentation [skip ci] **What does does this PR do / why we need it**: Updates the file reference documentation to not have the introductory section and move unsupported features to the bottom. **Which issue(s) this PR fixes**: N/A **PR acceptance criteria**: N/A **How to test changes / Special notes to the reviewer**: N/A Signed-off-by: Charlie Drage <charlie@charliedrage.com> * make odo delete work on s2i components in experimental mode (#3649) * Fixes GetRunningPodNameByComponent for the CLI runners (#3666) * increase ResponseHeaderTimeout (#3674) * Make the file sync destination more consistent (#3662) * Make the file sync destination more consistent Signed-off-by: John Collier <John.J.Collier@ibm.com> * Update tests to use PROJECTS_ROOT Signed-off-by: John Collier <John.J.Collier@ibm.com> * Fix workdir in tests Signed-off-by: John Collier <John.J.Collier@ibm.com> * Remove more references to nodejs-starter Signed-off-by: John Collier <John.J.Collier@ibm.com> * Update more sample devfiles Signed-off-by: John Collier <John.J.Collier@ibm.com> * make odo catalog list components work outside of experimental mode (#3669) * make odo catalog list components work outside of experimental mode * moved the logic to cli * Ignore error while checking for imagestream support * rearranged the catalog list * Validate exec subcommands in a composite (#3658) * Validate exec subcommands in composite * Add integration test * added --s2i flag for `odo create` command * corrected error messages * Corrected flag description and validation * added --s2i flag for `odo create` command * Make Devfile the default deployment mechanism for odo **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**: Closes #3550 **How to test changes / Special notes to the reviewer**: Run: ```sh odo preference set experimental false odo create --starter nodejs odo push ``` Co-authored-by: Girish Ramnani <girishramnani95@gmail.com> Co-authored-by: Mrinal Das <mrinald7@gmail.com> Co-authored-by: Tomas Kral <tkral@redhat.com> Co-authored-by: John Collier <John.J.Collier@ibm.com> Co-authored-by: Devang Gaur <devang.gaur.7@gmail.com>

make odo catalog list components work outside of experimental mode

ddd4170

openshift-ci-robot added the kind/feature Categorizes issue as a feature request. For PRs, that means that the PR is the implementation label Jul 31, 2020

openshift-ci-robot requested review from dharmit and GeekArthur July 31, 2020 10:02

cdrage mentioned this pull request Jul 31, 2020

Make Devfile the default deployment mechanism for odo #3634

Merged

moved the logic to cli

af5fffd

Ignore error while checking for imagestream support

c8d47dd

cdrage mentioned this pull request Jul 31, 2020

Move the devfile feature set out of the experimental mode #3550

Closed

3 tasks

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. Required by Prow. label Jul 31, 2020

rearranged the catalog list

a380ccd

devang-gaur suggested changes Jul 31, 2020

View reviewed changes

openshift-ci-robot assigned devang-gaur Jul 31, 2020

openshift-ci-robot assigned cdrage Jul 31, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Jul 31, 2020

openshift-merge-robot merged commit eec1f66 into redhat-developer:master Aug 4, 2020

make odo catalog list components work outside of experimental mode #3669

make odo catalog list components work outside of experimental mode #3669

Conversation

girishramnani commented Jul 31, 2020

girishramnani commented Jul 31, 2020

kadel commented Jul 31, 2020

dharmit commented Jul 31, 2020

kadel commented Jul 31, 2020

girishramnani commented Jul 31, 2020

girishramnani commented Jul 31, 2020

cdrage commented Jul 31, 2020 • edited

openshift-ci-robot commented Jul 31, 2020

girishramnani commented Jul 31, 2020

cdrage commented Jul 31, 2020

devang-gaur left a comment

Choose a reason for hiding this comment

devang-gaur Jul 31, 2020 • edited

Choose a reason for hiding this comment

devang-gaur Jul 31, 2020

Choose a reason for hiding this comment

cdrage commented Jul 31, 2020

openshift-bot commented Jul 31, 2020

cdrage commented Jul 31, 2020

girishramnani commented Jul 31, 2020

openshift-bot commented Aug 1, 2020

openshift-bot commented Aug 1, 2020

codecov bot commented Aug 1, 2020 • edited

Codecov Report

openshift-bot commented Aug 1, 2020

openshift-bot commented Aug 1, 2020

openshift-bot commented Aug 1, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 2, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

kadel commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

openshift-bot commented Aug 3, 2020

cdrage commented Jul 31, 2020 •

edited

devang-gaur Jul 31, 2020 •

edited

codecov bot commented Aug 1, 2020 •

edited