Removing remaining service catalog references #5033

mohammedzee1000 · 2021-09-01T10:24:27Z

What type of PR is this?
/kind cleanup

What does this PR do / why we need it:
see topic

Which issue(s) this PR fixes:

PR acceptance criteria:

Unit test
Integration test
Documentation
I have read the test guidelines

How to test changes / Special notes to the reviewer:
Operator hub service should not be broken
It should no longer be possible to anything with service catalog services

mohammedzee1000 · 2021-09-08T08:30:21Z

maven central issue https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_odo/5033/pull-ci-openshift-odo-main-psi-kubernetes-integration-e2e/1435498930216374272#1:build-log.txt%3A1009
/test psi-kubernetes-integration-e2e

feloy

I can see some functions/types on service/service.go that are unused :

CreateOperatorService
DeleteServiceAndUnlinkComponents
GetGVKRFromCR
InstanceCreateParameterSchema

There are also these files:

pkg/kclient/serviceCatalog.go
pkg/kclient/serviceCatalog_test.go

feloy · 2021-09-09T09:23:06Z

pkg/service/types.go

-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Service `json:"items"`
+// ServiceClass holds the information regarding a service catalog service class


I think this comes from an old version. I cannot see how it is used

Do we want to remove them? they are operator related correct

And yea il look at the files

I'm talking about ServiceClass. It is not used anywhere on the code

About the files I found there are functions that are not specific to service catalog. I will see what I can do

Sorry I was referring to the functions you listed, ServiceClass yea, it needs to go

feloy · 2021-09-09T11:22:15Z

pkg/odo/cli/catalog/search/service.go

-		// Kubernetes or OpenShift 4.x cluster. It doesn't occur when there are
-		// no operators installed.
-		noCsvs = true
+		return fmt.Errorf("unable to list services because Operator Hub is enabled in your cluster: %v", err)


Operator Hub is not enabled

you mean the error message?

mohammedzee1000 · 2021-09-09T12:13:11Z

retrying to be safe

/test psi-kubernetes-integration-e2e

feloy · 2021-09-10T12:50:16Z

/approve

openshift-ci · 2021-09-10T12:50:42Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feloy

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:

~~OWNERS~~ [feloy]

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

feloy · 2021-09-10T12:57:30Z

The output of odo link -h is

Usage:
  odo link <operator-service-type>/<service-name> OR link <service> --component [component] OR link <component> --component [component] [flags]

I think the link <service> --component [component] part is not accurate anymore

mohammedzee1000 · 2021-09-13T06:06:40Z

The output of odo link -h is
Usage:
  odo link <operator-service-type>/<service-name> OR link <service> --component [component] OR link <component> --component [component] [flags]
I think the link <service> --component [component] part is not accurate anymore

Removing

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

sonarcloud · 2021-09-13T07:10:35Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
6.4% Duplication

feloy · 2021-09-13T08:56:38Z

/lgtm

Thanks @mohammedzee1000 for this cleanup

openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. kind/cleanup labels Sep 1, 2021

openshift-ci bot requested review from dharmit and valaparthvi September 1, 2021 10:24

mohammedzee1000 force-pushed the service_cat_p2 branch from 1708a27 to f56144f Compare September 3, 2021 06:21

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Sep 4, 2021

mohammedzee1000 force-pushed the service_cat_p2 branch from 9e0f119 to c2a39bc Compare September 8, 2021 06:31

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Sep 8, 2021

mohammedzee1000 changed the title ~~WIP Removing remaining service catalog references~~ Removing remaining service catalog references Sep 8, 2021

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. label Sep 8, 2021

mohammedzee1000 force-pushed the service_cat_p2 branch from 8a73393 to d993622 Compare September 9, 2021 08:04

feloy reviewed Sep 9, 2021

View reviewed changes

mohammedzee1000 force-pushed the service_cat_p2 branch from d993622 to 8b0c4db Compare September 9, 2021 10:51

feloy reviewed Sep 9, 2021

View reviewed changes

mohammedzee1000 force-pushed the service_cat_p2 branch from 747ce3c to 85b972f Compare September 9, 2021 12:15

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. Required by Prow. label Sep 10, 2021

mohammedzee1000 added 8 commits September 13, 2021 11:37

Removing remaining refs of service catalog code

913fe2a

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing remaining unused service structs

36d9717

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing gofmt

a925d97

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing after rebase

c8b2410

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing unused labels

387b1ea

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Shortening odo link -h output

6ada320

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing test

ff95f96

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing unused serviceclass

7a021a5

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

mohammedzee1000 added 7 commits September 13, 2021 11:37

Removing service cat link refs

edc671f

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing unused functions

2d9647e

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Removing left out kclient svc catalog and its refs

8af3d3b

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing gofmt error

fc9cec9

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing error message

3a59920

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Fixing import

db606c6

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

Updating link usage

e4edb0d

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

mohammedzee1000 force-pushed the service_cat_p2 branch from 85b972f to e4edb0d Compare September 13, 2021 06:14

Fixing usage commit

afb1192

Signed-off-by: Mohammed Zeeshan Ahmed <mohammed.zee1000@gmail.com>

openshift-ci bot assigned feloy Sep 13, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Sep 13, 2021

openshift-merge-robot merged commit 72186ca into redhat-developer:main Sep 13, 2021

rm3l added the area/refactoring Issues or PRs related to code refactoring label Jun 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Removing remaining service catalog references #5033

Removing remaining service catalog references #5033

mohammedzee1000 commented Sep 1, 2021 •

edited

mohammedzee1000 commented Sep 8, 2021 •

edited

feloy left a comment •

edited

feloy Sep 9, 2021

mohammedzee1000 Sep 9, 2021

mohammedzee1000 Sep 9, 2021

feloy Sep 9, 2021

mohammedzee1000 Sep 9, 2021

mohammedzee1000 Sep 9, 2021 •

edited

feloy Sep 9, 2021

mohammedzee1000 Sep 9, 2021

mohammedzee1000 Sep 9, 2021

mohammedzee1000 Sep 9, 2021

mohammedzee1000 commented Sep 9, 2021

feloy commented Sep 10, 2021

openshift-ci bot commented Sep 10, 2021

feloy commented Sep 10, 2021

mohammedzee1000 commented Sep 13, 2021

sonarcloud bot commented Sep 13, 2021

feloy commented Sep 13, 2021

Removing remaining service catalog references #5033

Removing remaining service catalog references #5033

Conversation

mohammedzee1000 commented Sep 1, 2021 • edited

mohammedzee1000 commented Sep 8, 2021 • edited

feloy left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mohammedzee1000 Sep 9, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mohammedzee1000 commented Sep 9, 2021

feloy commented Sep 10, 2021

openshift-ci bot commented Sep 10, 2021

feloy commented Sep 10, 2021

mohammedzee1000 commented Sep 13, 2021

sonarcloud bot commented Sep 13, 2021

feloy commented Sep 13, 2021

mohammedzee1000 commented Sep 1, 2021 •

edited

mohammedzee1000 commented Sep 8, 2021 •

edited

feloy left a comment •

edited

mohammedzee1000 Sep 9, 2021 •

edited