You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/03/01 15:03:25 UTC
[camel-k] 02/02: remove operator-lifecycle-manager dependency
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch release-1.2.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b42b6c102b3b70c5f18768889a4f62b0d78db113
Author: akihikokuroda <ak...@us.ibm.com>
AuthorDate: Mon Mar 1 13:55:27 2021 +0000
remove operator-lifecycle-manager dependency
---
go.mod | 2 --
go.sum | 6 ------
pkg/apis/addtoscheme_olm.go | 6 ++++--
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/go.mod b/go.mod
index 0393c46..10357d0 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,6 @@ require (
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-20200903182547-fddbf04ca175
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.42.1
github.com/radovskyb/watcher v1.0.6
@@ -51,7 +50,6 @@ require (
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
- github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200321030439-57b580e57e88 => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200903182547
k8s.io/client-go => k8s.io/client-go v0.18.9
k8s.io/code-generator => k8s.io/code-generator v0.18.9
)
diff --git a/go.sum b/go.sum
index 6ecee3a..f6ada12 100644
--- a/go.sum
+++ b/go.sum
@@ -976,12 +976,6 @@ github.com/operator-framework/api v0.3.12 h1:In6bSbDr5zVOb5ats7TBMnl1h0hCIjkAxXk
github.com/operator-framework/api v0.3.12/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
github.com/operator-framework/operator-lib v0.1.0 h1:7Qy6v2ZccvCeFLWEkrGnN+U+DkaeIWp0gAZaBM9T3DI=
github.com/operator-framework/operator-lib v0.1.0/go.mod h1:HLw61JTIEeq0YLeVf4dwYx/zt4DmLGZUVWI1y3Lf5Hg=
-github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200321030439-57b580e57e88 h1:ByKBik0i2aTEr7iKdSCmUGULydHwr6hA0h4INv9LkSA=
-github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200321030439-57b580e57e88/go.mod h1:7Ut8p9jJ8C6RZyyhZfZypmlibCIJwK5Wcc+WZDgLkOA=
-github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200903182547-fddbf04ca175 h1:5hEYbs/U3ZzAiGrxsbvj+IMtXaGUV2hwDnZFBhGKKTc=
-github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200903182547-fddbf04ca175/go.mod h1:UwsM5sJtJBZHeBsRfRX+u4TqygcAm6ut90nCFJRe4wQ=
-github.com/operator-framework/operator-registry v1.5.3/go.mod h1:agrQlkWOo1q8U1SAaLSS2WQ+Z9vswNT2M2HFib9iuLY=
-github.com/operator-framework/operator-registry v1.6.1/go.mod h1:sx4wWMiZtYhlUiaKscg3QQUPPM/c1bkrAs4n4KipDb4=
github.com/operator-framework/operator-registry v1.13.6/go.mod h1:YhnIzOVjRU2ZwZtzt+fjcjW8ujJaSFynBEu7QVKaSdU=
github.com/otiai10/copy v1.0.1/go.mod h1:8bMCJrAqOtN/d9oyh5HR7HhLQMvcGMpGdwRDYsfOCHc=
github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
diff --git a/pkg/apis/addtoscheme_olm.go b/pkg/apis/addtoscheme_olm.go
index 1430b47..301bee8 100644
--- a/pkg/apis/addtoscheme_olm.go
+++ b/pkg/apis/addtoscheme_olm.go
@@ -18,10 +18,12 @@ limitations under the License.
package apis
import (
- scheme "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/scheme"
+ 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, scheme.AddToScheme)
+ AddToSchemes = append(AddToSchemes, operatorsv1.AddToScheme, operatorsv1alpha1.AddToScheme, operatorsv1alpha2.AddToScheme)
}