Bug 1790785: bump(operator-framework/operator-registry) #316

ecordell · 2020-02-21T23:29:50Z

Bumps operator-registry, which fixes two BZs:

https://bugzilla.redhat.com/show_bug.cgi?id=1790785
https://bugzilla.redhat.com/show_bug.cgi?id=1772942 (already fixed in master, but this needs to propagate to 4.3)

openshift-ci-robot · 2020-02-21T23:30:13Z

@ecordell: This pull request references Bugzilla bug 1790785, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Bug 1790785: bump(operator-framework/operator-registry)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2020-02-21T23:30:41Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ecordell
To complete the pull request process, please assign smarterclayton
You can assign the PR to them by writing /assign @smarterclayton in a comment when ready.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

ecordell · 2020-02-21T23:48:55Z

/retest

ecordell · 2020-02-22T14:14:58Z

/retest

soltysh · 2020-02-24T14:01:46Z

go.mod

 	github.com/mtrmac/gpgme v0.1.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1
-	github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
+	github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible


This is unexpected change.

From what I checked this is somehow a transitive dependency that's coming only when I change operator-registry, if I bump openshift deps this will work just fine picking newer version, which makes me worried a lot about that bump.

soltysh · 2020-02-24T14:01:52Z

go.mod

 	k8s.io/apiserver v0.17.1
 	k8s.io/cli-runtime v0.17.0
-	k8s.io/client-go v0.17.1
+	k8s.io/client-go v8.0.0+incompatible


Same this one.

I do want to point out that this is replaced later at

oc/go.mod

Line 77 in f447321

k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20191211181558-5dcabadb2b45

. Therefore it does not matter that is it changed at this stage.

soltysh · 2020-02-24T14:01:56Z

go.mod

 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.0.0
-	k8s.io/kubernetes v0.0.0-00010101000000-000000000000
+	k8s.io/kubernetes v1.16.0


Same as above at

oc/go.mod

Line 90 in f447321

k8s.io/kubernetes => github.com/openshift/kubernetes v1.17.0-alpha.0.0.20191216151305-079984b0a154

.

soltysh · 2020-02-24T14:02:02Z

go.mod

 replace (
 	github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
 	github.com/containers/image => github.com/openshift/containers-image v0.0.0-20190130162819-76de87591e9d
+	github.com/openshift/api => github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87


This is not needed.

This replaces https://github.com/openshift/oc/pull/316/files#r383280617, therefore, it does not change dependencies at all.

Bowenislandsong

Thank you very much for the review. I did try very hard to sort everything out. However, It does seem like these changes are not affecting the dependencies at all since they are overwritten by replace right after. Other than the fact that they do not look as pretty in format. These changes should be harmless. Please let me know what you think. Thank you.

Bowenislandsong · 2020-02-24T23:12:23Z

go.mod

 	k8s.io/apiserver v0.17.1
 	k8s.io/cli-runtime v0.17.0
-	k8s.io/client-go v0.17.1
+	k8s.io/client-go v8.0.0+incompatible


I do want to point out that this is replaced later at

oc/go.mod

Line 77 in f447321

k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20191211181558-5dcabadb2b45

. Therefore it does not matter that is it changed at this stage.

Bowenislandsong · 2020-02-24T23:12:45Z

go.mod

 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.0.0
-	k8s.io/kubernetes v0.0.0-00010101000000-000000000000
+	k8s.io/kubernetes v1.16.0


Same as above at

oc/go.mod

Line 90 in f447321

k8s.io/kubernetes => github.com/openshift/kubernetes v1.17.0-alpha.0.0.20191216151305-079984b0a154

.

Bowenislandsong · 2020-02-24T23:13:32Z

go.mod

 replace (
 	github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
 	github.com/containers/image => github.com/openshift/containers-image v0.0.0-20190130162819-76de87591e9d
+	github.com/openshift/api => github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87


This replaces https://github.com/openshift/oc/pull/316/files#r383280617, therefore, it does not change dependencies at all.

soltysh · 2020-02-26T12:42:01Z

go.mod

 	github.com/mtrmac/gpgme v0.1.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1
-	github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
+	github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible


From what I checked this is somehow a transitive dependency that's coming only when I change operator-registry, if I bump openshift deps this will work just fine picking newer version, which makes me worried a lot about that bump.

soltysh · 2020-02-26T12:42:46Z

/hold
I'll have another look at it

soltysh · 2020-02-27T13:54:07Z

I'll keep this on hold, I have agreement with @ecordell he'll look into fixing some of deps in operator-registry.

Bowenislandsong · 2020-02-27T20:46:33Z

I want to mention that this solution makes the least amount of effort in changes and it is easy to backport.

Bumps operator-registry, which fixes two BZs: https://bugzilla.redhat.com/show_bug.cgi?id=1790785 https://bugzilla.redhat.com/show_bug.cgi?id=1772942 (already fixed in master, but this needs to propagate to 4.3) This commit supersedes openshift#316.

Bowenislandsong · 2020-02-27T20:51:20Z

/close
superseded by #329

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 21, 2020

ecordell changed the title ~~bump(operator-framework/operator-registry)~~ Bug 1790785: bump(operator-framework/operator-registry) Feb 21, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 21, 2020

openshift-ci-robot requested review from mfojtik and soltysh February 21, 2020 23:30

bump(operator-framework/operator-registry)

f447321

ecordell force-pushed the operator-registry-1.5.10 branch from d657b40 to f447321 Compare February 21, 2020 23:33

soltysh suggested changes Feb 24, 2020

View reviewed changes

Bowenislandsong mentioned this pull request Feb 24, 2020

Bug 1790785: oc adm catalog build should immediately error out if it can't find any data in appregistry #288

Closed

Bowenislandsong reviewed Feb 24, 2020

View reviewed changes

soltysh suggested changes Feb 26, 2020

View reviewed changes

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2020

Bowenislandsong mentioned this pull request Feb 27, 2020

Bug 1790785: bump(operator-framework/operator-registry) #329

Merged

soltysh closed this Feb 27, 2020

Bug 1790785: bump(operator-framework/operator-registry) #316

Bug 1790785: bump(operator-framework/operator-registry) #316

Uh oh!

Conversation

ecordell commented Feb 21, 2020

Uh oh!

openshift-ci-robot commented Feb 21, 2020

Uh oh!

openshift-ci-robot commented Feb 21, 2020

Uh oh!

ecordell commented Feb 21, 2020

Uh oh!

ecordell commented Feb 22, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Bowenislandsong left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

soltysh commented Feb 26, 2020

Uh oh!

soltysh commented Feb 27, 2020

Uh oh!

Bowenislandsong commented Feb 27, 2020

Uh oh!

Bowenislandsong commented Feb 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Bowenislandsong commented Feb 27, 2020 •

edited

Loading