Skip to content

Commit e05e912

Browse files
FabianKrammFabianKramm
authored
Merge pull request #2499 from FabianKramm/main
refactor: always use buildkit for local registry
2 parents 5d6653b + 8f641f9 commit e05e912

1,253 files changed

Lines changed: 151921 additions & 49973 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/cleanup/local_registry.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package cleanup
22

33
import (
44
"context"
5+
"github.com/loft-sh/devspace/pkg/devspace/build/localregistry"
56

67
"github.com/loft-sh/devspace/cmd/flags"
7-
"github.com/loft-sh/devspace/pkg/devspace/build/registry"
88
"github.com/loft-sh/devspace/pkg/devspace/kubectl"
99
"github.com/loft-sh/devspace/pkg/util/factory"
1010
"github.com/loft-sh/devspace/pkg/util/message"
@@ -90,7 +90,7 @@ func (cmd *localRegistryCmd) RunCleanupLocalRegistry(f factory.Factory, cobraCmd
9090

9191
// clean up registry according to options
9292
config := configInterface.Config()
93-
options := registry.NewDefaultOptions().
93+
options := localregistry.NewDefaultOptions().
9494
WithNamespace(client.Namespace()).
9595
WithLocalRegistryConfig(config.LocalRegistry)
9696

‎e2e/tests/localregistry/localregistry.go‎

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package localregistry
33
import (
44
"bytes"
55
"context"
6-
"fmt"
6+
"github.com/loft-sh/devspace/pkg/devspace/build/localregistry"
77
"github.com/onsi/ginkgo/v2"
88
"os"
99
"time"
1010

11-
"github.com/google/go-containerregistry/pkg/name"
12-
"github.com/google/go-containerregistry/pkg/v1/remote"
1311
"github.com/sirupsen/logrus"
1412
appsv1 "k8s.io/api/apps/v1"
1513
corev1 "k8s.io/api/core/v1"
@@ -19,7 +17,6 @@ import (
1917
"github.com/loft-sh/devspace/cmd/flags"
2018
"github.com/loft-sh/devspace/e2e/framework"
2119
"github.com/loft-sh/devspace/e2e/kube"
22-
"github.com/loft-sh/devspace/pkg/devspace/build/registry"
2320
"github.com/loft-sh/devspace/pkg/util/factory"
2421
logpkg "github.com/loft-sh/devspace/pkg/util/log"
2522
"github.com/onsi/gomega"
@@ -28,7 +25,6 @@ import (
2825
)
2926

3027
var _ = DevSpaceDescribe("localregistry", func() {
31-
3228
initialDir, err := os.Getwd()
3329
if err != nil {
3430
panic(err)
@@ -87,7 +83,6 @@ var _ = DevSpaceDescribe("localregistry", func() {
8783
done <- devCmd.RunDefault(f)
8884
}()
8985

90-
var registryHost string
9186
ginkgo.By("Waiting for registry service node port")
9287
gomega.Eventually(func() (*corev1.Service, error) {
9388
service, err := getRegistryService(ctx, kubeClient, ns)
@@ -96,9 +91,8 @@ var _ = DevSpaceDescribe("localregistry", func() {
9691
}
9792

9893
if service != nil {
99-
registryPort := registry.GetServicePort(service)
94+
registryPort := localregistry.GetServicePort(service)
10095
if registryPort.NodePort != 0 {
101-
registryHost = fmt.Sprintf("localhost:%d", registryPort.NodePort)
10296
return service, nil
10397
}
10498
}
@@ -107,10 +101,6 @@ var _ = DevSpaceDescribe("localregistry", func() {
107101
}, pollingDurationLong, pollingInterval).
108102
ShouldNot(gomega.BeNil())
109103

110-
ginkgo.By("Checking registry for pushed image")
111-
gomega.Eventually(getImages(ctx, registryHost), pollingDurationLong, pollingInterval).
112-
Should(gomega.ContainElement("my-docker-username/helloworld"))
113-
114104
ginkgo.By("Checking deployment container1")
115105
gomega.Eventually(selectContainerImage(kubeClient, ns, "app", "container1"), pollingDurationLong, pollingInterval).
116106
Should(gomega.MatchRegexp(`^localhost`))
@@ -151,7 +141,6 @@ var _ = DevSpaceDescribe("localregistry", func() {
151141
done <- devCmd.RunDefault(f)
152142
}()
153143

154-
var registryHost string
155144
ginkgo.By("Waiting for registry service node port")
156145
gomega.Eventually(func() (*corev1.Service, error) {
157146
service, err := getRegistryService(ctx, kubeClient, ns)
@@ -160,9 +149,8 @@ var _ = DevSpaceDescribe("localregistry", func() {
160149
}
161150

162151
if service != nil {
163-
registryPort := registry.GetServicePort(service)
152+
registryPort := localregistry.GetServicePort(service)
164153
if registryPort.NodePort != 0 {
165-
registryHost = fmt.Sprintf("localhost:%d", registryPort.NodePort)
166154
return service, nil
167155
}
168156
}
@@ -171,10 +159,6 @@ var _ = DevSpaceDescribe("localregistry", func() {
171159
}, pollingDurationLong, pollingInterval).
172160
ShouldNot(gomega.BeNil())
173161

174-
ginkgo.By("Checking registry for pushed image")
175-
gomega.Eventually(getImages(ctx, registryHost), pollingDurationLong, pollingInterval).
176-
Should(gomega.ContainElement("my-docker-username/helloworld"))
177-
178162
ginkgo.By("Checking deployment container1")
179163
gomega.Eventually(selectContainerImage(kubeClient, ns, "app", "container1"), pollingDurationLong, pollingInterval).
180164
Should(gomega.MatchRegexp(`^localhost`))
@@ -483,22 +467,6 @@ func getRegistryService(ctx context.Context, kubeHelper *kube.KubeHelper, namesp
483467
return service, nil
484468
}
485469

486-
func getImages(ctx context.Context, registryHost string) func() ([]string, error) {
487-
return func() ([]string, error) {
488-
registry, err := name.NewRegistry(registryHost)
489-
if err != nil {
490-
return nil, err
491-
}
492-
493-
images, err := remote.Catalog(ctx, registry)
494-
if err != nil {
495-
return nil, err
496-
}
497-
498-
return images, nil
499-
}
500-
}
501-
502470
func readFile(name string) func() (string, error) {
503471
return func() (string, error) {
504472
out, err := os.ReadFile(name)

‎go.mod‎

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ require (
99
github.com/bmatcuk/doublestar v1.1.1
1010
github.com/compose-spec/compose-go v1.2.2
1111
github.com/creack/pty v1.1.17
12-
github.com/docker/cli v20.10.21+incompatible
12+
github.com/docker/cli v23.0.0-rc.1+incompatible
1313
github.com/docker/distribution v2.8.1+incompatible
14-
github.com/docker/docker v20.10.21+incompatible
14+
github.com/docker/docker v23.0.0-rc.1+incompatible
1515
github.com/docker/go-connections v0.4.0
1616
github.com/evanphx/json-patch v4.12.0+incompatible
1717
github.com/evanphx/json-patch/v5 v5.1.0
@@ -33,7 +33,7 @@ require (
3333
github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee
3434
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
3535
github.com/mitchellh/go-homedir v1.1.0
36-
github.com/moby/buildkit v0.8.2
36+
github.com/moby/buildkit v0.11.0
3737
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
3838
github.com/olekukonko/tablewriter v0.0.5
3939
github.com/onsi/ginkgo/v2 v2.7.0
@@ -47,11 +47,11 @@ require (
4747
github.com/spf13/cobra v1.5.0
4848
github.com/spf13/pflag v1.0.5
4949
github.com/vmware-labs/yaml-jsonpath v0.3.2
50-
golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d
51-
golang.org/x/net v0.3.0
50+
golang.org/x/crypto v0.2.0
51+
golang.org/x/net v0.4.0
5252
golang.org/x/text v0.5.0
53-
google.golang.org/grpc v1.47.0
54-
google.golang.org/protobuf v1.28.0
53+
google.golang.org/grpc v1.50.1
54+
google.golang.org/protobuf v1.28.1
5555
gopkg.in/natefinch/lumberjack.v2 v2.0.0
5656
gopkg.in/src-d/enry.v1 v1.6.4
5757
gopkg.in/src-d/go-git.v4 v4.13.1
@@ -77,38 +77,43 @@ require (
7777
github.com/Azure/go-autorest/logger v0.2.1 // indirect
7878
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
7979
github.com/Microsoft/go-winio v0.5.2 // indirect
80-
github.com/Microsoft/hcsshim v0.8.10 // indirect
8180
github.com/PuerkitoBio/purell v1.1.1 // indirect
8281
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
8382
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
8483
github.com/beorn7/perks v1.0.1 // indirect
85-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
86-
github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340 // indirect
87-
github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc // indirect
88-
github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect
84+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
85+
github.com/containerd/console v1.0.3 // indirect
86+
github.com/containerd/containerd v1.6.14 // indirect
87+
github.com/containerd/continuity v0.3.0 // indirect
88+
github.com/containerd/typeurl v1.0.2 // indirect
8989
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
9090
github.com/davecgh/go-spew v1.1.1 // indirect
9191
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e // indirect
92-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
92+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
9393
github.com/docker/go-metrics v0.0.1 // indirect
94-
github.com/docker/go-units v0.4.0 // indirect
94+
github.com/docker/go-units v0.5.0 // indirect
9595
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
9696
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
9797
github.com/emirpasic/gods v1.12.0 // indirect
9898
github.com/go-logr/logr v1.2.3 // indirect
99+
github.com/go-logr/stdr v1.2.2 // indirect
99100
github.com/go-openapi/jsonpointer v0.19.5 // indirect
100101
github.com/go-openapi/jsonreference v0.19.5 // indirect
101102
github.com/go-openapi/swag v0.19.14 // indirect
103+
github.com/gofrs/flock v0.8.1 // indirect
104+
github.com/gogo/googleapis v1.4.1 // indirect
102105
github.com/gogo/protobuf v1.3.2 // indirect
103-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
104-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
106+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
105107
github.com/golang/protobuf v1.5.2 // indirect
106108
github.com/google/gnostic v0.5.7-v3refs // indirect
107109
github.com/google/go-cmp v0.5.9 // indirect
108110
github.com/google/go-github/v30 v30.1.0 // indirect
109111
github.com/google/go-querystring v1.0.0 // indirect
110-
github.com/google/gofuzz v1.1.0 // indirect
112+
github.com/google/gofuzz v1.2.0 // indirect
113+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
111114
github.com/gorilla/mux v1.8.0 // indirect
115+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
116+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
112117
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
113118
github.com/imdario/mergo v0.3.12 // indirect
114119
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
@@ -117,51 +122,60 @@ require (
117122
github.com/josharian/intern v1.0.0 // indirect
118123
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
119124
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
120-
github.com/klauspost/compress v1.15.8 // indirect
125+
github.com/klauspost/compress v1.15.12 // indirect
121126
github.com/kr/fs v0.1.0 // indirect
122127
github.com/mailru/easyjson v0.7.6 // indirect
123128
github.com/mattn/go-colorable v0.1.11 // indirect
124129
github.com/mattn/go-isatty v0.0.14 // indirect
125130
github.com/mattn/go-runewidth v0.0.9 // indirect
126131
github.com/mattn/go-shellwords v1.0.12 // indirect
127-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
132+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
128133
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
129134
github.com/mitchellh/mapstructure v1.4.3 // indirect
135+
github.com/moby/patternmatcher v0.5.0 // indirect
130136
github.com/moby/spdystream v0.2.0 // indirect
131-
github.com/moby/sys/mount v0.1.1 // indirect
132-
github.com/moby/sys/mountinfo v0.4.0 // indirect
137+
github.com/moby/sys/sequential v0.5.0 // indirect
138+
github.com/moby/sys/signal v0.7.0 // indirect
133139
github.com/moby/sys/symlink v0.2.0 // indirect
134140
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
135141
github.com/modern-go/reflect2 v1.0.2 // indirect
136142
github.com/morikuni/aec v1.0.0 // indirect
137143
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
144+
github.com/onsi/ginkgo v1.12.1 // indirect
138145
github.com/opencontainers/go-digest v1.0.0 // indirect
139-
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
140-
github.com/opencontainers/runc v1.0.0-rc92 // indirect
141-
github.com/prometheus/client_golang v1.7.1 // indirect
142-
github.com/prometheus/client_model v0.2.0 // indirect
143-
github.com/prometheus/common v0.10.0 // indirect
144-
github.com/prometheus/procfs v0.6.0 // indirect
146+
github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 // indirect
147+
github.com/opencontainers/runc v1.1.3 // indirect
148+
github.com/prometheus/client_golang v1.14.0 // indirect
149+
github.com/prometheus/client_model v0.3.0 // indirect
150+
github.com/prometheus/common v0.37.0 // indirect
151+
github.com/prometheus/procfs v0.8.0 // indirect
145152
github.com/russross/blackfriday/v2 v2.1.0 // indirect
146153
github.com/sergi/go-diff v1.1.0 // indirect
147154
github.com/src-d/gcfg v1.4.0 // indirect
148155
github.com/syncthing/notify v0.0.0-20210616190510-c6b7342338d2 // indirect
149156
github.com/tcnksm/go-gitconfig v0.1.2 // indirect
157+
github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa // indirect
158+
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
159+
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
150160
github.com/toqueteos/trie v1.0.0 // indirect
151161
github.com/ulikunitz/xz v0.5.9 // indirect
152-
github.com/vbatts/tar-split v0.11.2 // indirect
153162
github.com/xanzy/ssh-agent v0.2.1 // indirect
154163
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
155164
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
156165
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
157-
go.opencensus.io v0.23.0 // indirect
166+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
167+
go.opentelemetry.io/otel v1.4.1 // indirect
168+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
169+
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
170+
go.opentelemetry.io/otel/trace v1.4.1 // indirect
171+
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
158172
golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
159173
golang.org/x/sync v0.1.0 // indirect
160174
golang.org/x/sys v0.3.0 // indirect
161175
golang.org/x/term v0.3.0 // indirect
162-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
176+
golang.org/x/time v0.1.0 // indirect
163177
google.golang.org/appengine v1.6.7 // indirect
164-
google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 // indirect
178+
google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect
165179
gopkg.in/inf.v0 v0.9.1 // indirect
166180
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
167181
gopkg.in/toqueteos/substring.v1 v1.0.2 // indirect

0 commit comments

Comments
 (0)