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 2020/04/29 08:50:11 UTC
[camel-k] branch master updated: Fix #1416: make minikube
experience super-fast again
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 4d0eacc Fix #1416: make minikube experience super-fast again
4d0eacc is described below
commit 4d0eacc7695da104e7080f6ed69810fbc0188d34
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Tue Apr 28 11:41:18 2020 +0200
Fix #1416: make minikube experience super-fast again
---
deploy/resources.go | 4 ++--
go.mod | 9 ++++++---
go.sum | 5 +++++
pkg/builder/spectrum/publisher.go | 2 ++
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index 430db9f..454f878 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -340,9 +340,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 28770,
+ uncompressedSize: 31566,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\x6d\x73\x1b\x37\x92\xf0\x77\xff\x0a\x94\x9e\x0f\x7a\x59\x72\x64\x67\x6b\x37\x59\x3d\xe5\x4a\xe9\x94\x64\x57\x49\x6c\xeb\x2c\x27\x7b\x57\xb9\xd4\x12\x9c\x69\x72\x60\x62\x80\x59\x00\x43\x99\xfb\xe9\xfe\xc6\xfd\xbd\xfb\x25\x57\xdd\x78\x19\xcc\x90\x92\x28\x3b\x4a\x59\xf1\x87\x88\xd4\x4c\xa3\xbb\xd1\xef\xdd\x80\x9c\xe1\xc2\xd9\xb3\x67\x53\xa6\x78\x03\x67\x8c\x2f\x16\x42\x09\xb7\x79\xc6\x58\x2b\xb9\x5b\x68\xd3\x9c\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\xed\x72\x1c\x37\x12\xd8\x7f\x3d\x05\x8a\x49\x15\x3f\x6a\x77\x28\xf9\xea\xce\x3e\x26\xca\x15\x23\xe9\xee\x68\x5b\x12\x23\xe9\xee\x92\xba\xb8\x6e\xb1\x33\xbd\xbb\x30\x31\xc0\x1c\x80\x21\xb5\x4e\xa5\x2a\xaf\x91\xd7\xcb\x93\xa4\xba\x1b\xc0\x60\x76\x97\xe4\x52\x36\x5d\xa6\xfd\x43\x5c\x72\xa6\xd1\x68\xf4\xf7\x07\x36\x38\xa9\x82\x3f\x7b\x36\x15\x46\xb6\x70\x26\xe4\x62\xa1\x8c\x0a\xeb\x67\x42\x74\x5a\x86\x85\x75\xed\x [...]
},
"/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{
name: "user-cluster-role.yaml",
diff --git a/go.mod b/go.mod
index ba55e6e..b042de0 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
// required by knative 0.12
contrib.go.opencensus.io/exporter/stackdriver v0.12.9-0.20191108183826-59d068f8d8ff // indirect
github.com/Masterminds/semver v1.5.0
- github.com/container-tools/spectrum v0.3.0
+ github.com/container-tools/spectrum v0.3.2
github.com/coreos/prometheus-operator v0.34.0
github.com/evanphx/json-patch v4.5.0+incompatible
github.com/fatih/structs v1.1.0
@@ -38,8 +38,8 @@ require (
go.uber.org/multierr v1.1.0
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.2.4
- k8s.io/api v0.17.0
- k8s.io/apimachinery v0.17.0
+ k8s.io/api v0.17.4
+ k8s.io/apimachinery v0.17.4
k8s.io/client-go v12.0.0+incompatible
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
knative.dev/eventing v0.12.0
@@ -76,3 +76,6 @@ replace (
)
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
+
+// Using a fork that removes the https ping before using http in case of insecure registry (for Spectrum)
+replace github.com/google/go-containerregistry => github.com/nicolaferraro/go-containerregistry v0.0.0-20200428072705-e7aced86aca8
diff --git a/go.sum b/go.sum
index d8dd2b3..d5fdd68 100644
--- a/go.sum
+++ b/go.sum
@@ -142,6 +142,8 @@ github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2
github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
github.com/container-tools/spectrum v0.3.0 h1:LrgO7cTuk/V301IV1Gf+MAhqXh+YXw42mKmawe1w5PU=
github.com/container-tools/spectrum v0.3.0/go.mod h1:n415mIONApBh3AzudGlBrFPNOaEB6mb2K9MZWmRLFSU=
+github.com/container-tools/spectrum v0.3.2 h1:KQz70RWAzITzaPx+qPsiGkrF0uGmFJfKak2yOqJyPKQ=
+github.com/container-tools/spectrum v0.3.2/go.mod h1:hsogRHNfGQLysCyDiGT4SAioTS8LGLbyC4b0Ep2Iw+o=
github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -578,6 +580,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
+github.com/nicolaferraro/go-containerregistry v0.0.0-20200428072705-e7aced86aca8 h1:TuLlDIMLWKpUXzgpi9SLZynUMVgYo7Wv5HlozPgX6CY=
+github.com/nicolaferraro/go-containerregistry v0.0.0-20200428072705-e7aced86aca8/go.mod h1:pD1UFYs7MCAx+ZLShBdttcaOSbyc8F9Na/9IZLNwJeA=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -764,6 +768,7 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
github.com/vdemeester/k8s-pkg-credentialprovider v0.0.0-20200107171650-7c61ffa44238/go.mod h1:JwQJCMWpUDqjZrB5jpw0f5VbN7U95zxFy1ZDpoEarGo=
+github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c=
github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
diff --git a/pkg/builder/spectrum/publisher.go b/pkg/builder/spectrum/publisher.go
index 5b834f7..5f89c69 100644
--- a/pkg/builder/spectrum/publisher.go
+++ b/pkg/builder/spectrum/publisher.go
@@ -69,6 +69,8 @@ func publisher(ctx *builder.Context) error {
Target: target,
PullInsecure: pullInsecure,
PushInsecure: pl.Status.Build.Registry.Insecure,
+ Stdout: os.Stdout,
+ Stderr: os.Stderr,
}
digest, err := spectrum.Build(options, libraryPath+":/deployments/dependencies")