You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/10/21 21:27:45 UTC
[camel-k] 10/13: Update after rebase.
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ce61b452b7ecea1e3c982a5bca0557b4f08d87d2
Author: Doru Bercea <gh...@ibm.com>
AuthorDate: Wed Oct 21 11:03:55 2020 -0400
Update after rebase.
---
deploy/resources.go | 4 ++--
go.mod | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index cf92514..162979f 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -326,9 +326,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 32785,
+ uncompressedSize: 32828,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x73\x1b\x37\x92\xf0\xf7\xfc\x0a\x94\x9e\xa7\x4a\xa2\x8a\x1c\xc9\xd9\xca\x26\xab\xbb\x5c\x4a\xeb\x38\xbb\x72\x62\x5b\x67\x39\xc9\x5d\xe5\xb6\x96\xe0\x4c\x93\x84\x85\x01\x66\x01\x0c\x65\xe6\xea\xfe\xfb\x55\x37\x5e\x06\x33\x1c\x49\x94\x63\xa5\xb4\x55\x57\xf9\x10\x93\x9a\x69\x34\x1a\xfd\xfe\x02\x3a\xc3\x85\xb3\x67\x9f\xcd\x98\xe2\x35\x9c\x31\xbe\x5c\x0a\x25\xdc\xf6\x33\xc6\x1a\xc9\xdd\x52\x9b\xfa\x8c\x2d\xb9\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x73\x1b\x37\x92\xf0\xf7\xfc\x0a\x94\x9e\xa7\x4a\xa2\x8a\x1c\xc9\xd9\xca\x26\xab\xbb\x5c\x4a\xeb\x38\xbb\x72\x62\x5b\x67\x39\xc9\x5d\xe5\xb6\x96\xe0\x4c\x93\x84\x85\x01\x66\x01\x0c\x65\xe6\xea\xfe\xfb\x55\x37\x5e\x06\x33\x1c\x49\x94\x63\xa5\xb4\x55\x57\xf9\x10\x93\x9a\x69\x34\x1a\xfd\xfe\x02\x3a\xc3\x85\xb3\x67\x9f\xcd\x98\xe2\x35\x9c\x31\xbe\x5c\x0a\x25\xdc\xf6\x33\xc6\x1a\xc9\xdd\x52\x9b\xfa\x8c\x2d\xb9\x [...]
},
"/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{
name: "user-cluster-role.yaml",
diff --git a/go.mod b/go.mod
index a100848..12c7fe1 100644
--- a/go.mod
+++ b/go.mod
@@ -52,11 +52,8 @@ require (
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
- k8s.io/api => k8s.io/api v0.17.6
- k8s.io/apimachinery => k8s.io/apimachinery v0.17.6
- k8s.io/client-go => k8s.io/client-go v0.17.6
- k8s.io/code-generator => k8s.io/code-generator v0.17.6
- sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.5.11
+ k8s.io/client-go => k8s.io/client-go v0.18.9
+ k8s.io/code-generator => k8s.io/code-generator v0.18.9
)
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm