You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by GitBox <gi...@apache.org> on 2021/02/28 13:52:28 UTC
[GitHub] [camel-k] akihikokuroda opened a new pull request #2071: update operator-lifecycle-manager
akihikokuroda opened a new pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071
<!-- Description -->
This PR is the fix for https://github.com/apache/camel-k/issues/2067 in release-1.2.x branch. It does minimum upgrade of the `operator-lifecycle-manager` to remove the `bou.ke/monkey` dependency.
<!--
Enter your extended release note in the below block. If the PR requires
additional action from users switching to the new release, include the string
"action required". If no release note is required, write "NONE".
You can (optionally) mark this PR with labels "kind/bug" or "kind/feature" to make sure
the text is added to the right section of the release notes.
-->
**Release Note**
```release-note
NONE
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a change in pull request #2071: update operator-lifecycle-manager
Posted by GitBox <gi...@apache.org>.
astefanutti commented on a change in pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071#discussion_r584515644
##########
File path: pkg/apis/addtoscheme_olm.go
##########
@@ -18,12 +18,10 @@ limitations under the License.
package apis
import (
- olmv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1"
- olmv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+ scheme "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/scheme"
Review comment:
I'd suggest to depend on `github.com/operator-framework/api` instead of `github.com/operator-framework/operator-lifecycle-manager/pkg/api` so that we can remove the dependency on the later, e.g.:
```suggestion
import (
operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
operatorsv1alpha2 "github.com/operator-framework/api/pkg/operators/v1alpha2"
)
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
AddToSchemes = append(AddToSchemes, operatorsv1.AddToScheme, operatorsv1alpha1.AddToScheme, operatorsv1alpha2.AddToScheme)
}
```
##########
File path: go.mod
##########
@@ -19,8 +19,9 @@ require (
github.com/onsi/gomega v1.10.1
github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
github.com/openshift/api v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible
+ github.com/operator-framework/api v0.3.12
github.com/operator-framework/operator-lib v0.1.0
- github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200321030439-57b580e57e88
+ github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200903182547-fddbf04ca175
Review comment:
I think that can be removed if we avoid depending on `github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/scheme` in `pkg/apis/addtoscheme_olm.go`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a change in pull request #2071: update operator-lifecycle-manager
Posted by GitBox <gi...@apache.org>.
astefanutti commented on a change in pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071#discussion_r584515937
##########
File path: go.mod
##########
@@ -19,8 +19,9 @@ require (
github.com/onsi/gomega v1.10.1
github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
github.com/openshift/api v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible
+ github.com/operator-framework/api v0.3.12
github.com/operator-framework/operator-lib v0.1.0
- github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200321030439-57b580e57e88
+ github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200903182547-fddbf04ca175
Review comment:
I think it can be removed if we avoid depending on `github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/scheme` in `pkg/apis/addtoscheme_olm.go`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] akihikokuroda commented on a change in pull request #2071: update operator-lifecycle-manager
Posted by GitBox <gi...@apache.org>.
akihikokuroda commented on a change in pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071#discussion_r584730988
##########
File path: go.mod
##########
@@ -19,8 +19,9 @@ require (
github.com/onsi/gomega v1.10.1
github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
github.com/openshift/api v3.9.1-0.20190927182313-d4a64ec2cbd8+incompatible
+ github.com/operator-framework/api v0.3.12
github.com/operator-framework/operator-lib v0.1.0
- github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200321030439-57b580e57e88
+ github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200903182547-fddbf04ca175
Review comment:
I took it out. Thanks!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti merged pull request #2071: update operator-lifecycle-manager
Posted by GitBox <gi...@apache.org>.
astefanutti merged pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] akihikokuroda commented on a change in pull request #2071: update operator-lifecycle-manager
Posted by GitBox <gi...@apache.org>.
akihikokuroda commented on a change in pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071#discussion_r584730604
##########
File path: pkg/apis/addtoscheme_olm.go
##########
@@ -18,12 +18,10 @@ limitations under the License.
package apis
import (
- olmv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1"
- olmv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+ scheme "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/scheme"
Review comment:
Thanks! I made the suggested changes.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-k] astefanutti commented on pull request #2071: update operator-lifecycle-manager
Posted by GitBox <gi...@apache.org>.
astefanutti commented on pull request #2071:
URL: https://github.com/apache/camel-k/pull/2071#issuecomment-788016994
Thanks.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org