Skip to content

Commit 385a323

Browse files
easyCZeasyCZ
authored
[installer] Do not pull blobserve implementation into installer (#16729)
* [installer] Do not pull blobserve implementation into installer * fix * fix * Fix * fix
1 parent 24fe829 commit 385a323

File tree

9 files changed

+72
-917
lines changed

9 files changed

+72
-917
lines changed

‎components/blobserve/cmd/run.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/containerd/containerd/remotes/docker"
2020
"github.com/docker/cli/cli/config/configfile"
2121
"github.com/docker/distribution/reference"
22-
"github.com/gitpod-io/gitpod/blobserve/pkg/config"
22+
blobserve_config "github.com/gitpod-io/gitpod/blobserve/pkg/config"
2323
"github.com/heptiolabs/healthcheck"
2424
"github.com/prometheus/client_golang/prometheus"
2525
"github.com/prometheus/client_golang/prometheus/collectors"
@@ -42,7 +42,7 @@ var runCmd = &cobra.Command{
4242
Short: "Starts the blobserve",
4343
Args: cobra.ExactArgs(1),
4444
Run: func(cmd *cobra.Command, args []string) {
45-
cfg, err := config.GetConfig(args[0])
45+
cfg, err := blobserve_config.GetConfig(args[0])
4646
if err != nil {
4747
log.WithError(err).WithField("filename", args[0]).Fatal("cannot load config")
4848
}

‎components/blobserve/pkg/blobserve/blobserve.go

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ import (
2424
"github.com/gorilla/mux"
2525
"golang.org/x/xerrors"
2626

27+
blobserve_config "github.com/gitpod-io/gitpod/blobserve/pkg/config"
2728
"github.com/gitpod-io/gitpod/common-go/log"
28-
"github.com/gitpod-io/gitpod/common-go/util"
2929
)
3030

3131
// ResolverProvider provides new resolver
3232
type ResolverProvider func() remotes.Resolver
3333

3434
// Server offers image blobs for download
3535
type Server struct {
36-
Config Config
36+
Config blobserve_config.BlobServe
3737
Resolver ResolverProvider
3838

3939
refstore *refstore
@@ -44,40 +44,6 @@ type BlobserveInlineVars struct {
4444
SupervisorImage string `json:"supervisor"`
4545
}
4646

47-
type BlobSpace struct {
48-
Location string `json:"location"`
49-
MaxSize int64 `json:"maxSizeBytes,omitempty"`
50-
}
51-
52-
type Repo struct {
53-
PrePull []string `json:"prePull,omitempty"`
54-
Workdir string `json:"workdir,omitempty"`
55-
Replacements []StringReplacement `json:"replacements,omitempty"`
56-
InlineStatic []InlineReplacement `json:"inlineStatic,omitempty"`
57-
}
58-
59-
// Config configures a server.
60-
type Config struct {
61-
Port int `json:"port"`
62-
Timeout util.Duration `json:"timeout,omitempty"`
63-
Repos map[string]Repo `json:"repos"`
64-
// AllowAnyRepo enables users to access any repo/image, irregardles if they're listed in the
65-
// ref config or not.
66-
AllowAnyRepo bool `json:"allowAnyRepo"`
67-
BlobSpace BlobSpace `json:"blobSpace"`
68-
}
69-
70-
type StringReplacement struct {
71-
Path string `json:"path"`
72-
Search string `json:"search"`
73-
Replacement string `json:"replacement"`
74-
}
75-
76-
type InlineReplacement struct {
77-
Search string `json:"search"`
78-
Replacement string `json:"replacement"`
79-
}
80-
8147
// From https://github.com/distribution/distribution/blob/v2.7.1/reference/regexp.go
8248
var match = regexp.MustCompile
8349

@@ -115,7 +81,7 @@ var ReferenceRegexp = expression(reference.NameRegexp,
11581
optional(literal("@"), reference.DigestRegexp))
11682

11783
// NewServer creates a new blob server
118-
func NewServer(cfg Config, resolver ResolverProvider) (*Server, error) {
84+
func NewServer(cfg blobserve_config.BlobServe, resolver ResolverProvider) (*Server, error) {
11985
refstore, err := newRefStore(cfg, resolver)
12086
if err != nil {
12187
return nil, err
@@ -202,7 +168,7 @@ func (reg *Server) serve(w http.ResponseWriter, req *http.Request) {
202168
repo := pref.Name()
203169

204170
var workdir string
205-
var inlineReplacements []InlineReplacement
171+
var inlineReplacements []blobserve_config.InlineReplacement
206172
if cfg, ok := reg.Config.Repos[repo]; ok {
207173
workdir = cfg.Workdir
208174
inlineReplacements = cfg.InlineStatic
@@ -285,7 +251,7 @@ func (reg *Server) serve(w http.ResponseWriter, req *http.Request) {
285251
http.StripPrefix(pathPrefix, http.FileServer(fs)).ServeHTTP(w, req)
286252
}
287253

288-
func inlineVars(req *http.Request, r io.ReadSeeker, inlineReplacements []InlineReplacement) (io.ReadSeeker, error) {
254+
func inlineVars(req *http.Request, r io.ReadSeeker, inlineReplacements []blobserve_config.InlineReplacement) (io.ReadSeeker, error) {
289255
inlineVarsValue := req.Header.Get("X-BlobServe-InlineVars")
290256
if len(inlineReplacements) == 0 || inlineVarsValue == "" {
291257
return r, nil

‎components/blobserve/pkg/blobserve/blobspace_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"path/filepath"
1414
"testing"
1515

16+
blobserve_config "github.com/gitpod-io/gitpod/blobserve/pkg/config"
1617
"github.com/google/go-cmp/cmp"
1718
)
1819

@@ -126,7 +127,7 @@ func Test_inlineVars(t *testing.T) {
126127
tests := []struct {
127128
Name string
128129
InlineVars *BlobserveInlineVars
129-
Replacements []InlineReplacement
130+
Replacements []blobserve_config.InlineReplacement
130131
Content string
131132
Expected string
132133
}{
@@ -141,7 +142,7 @@ func Test_inlineVars(t *testing.T) {
141142
},
142143
{
143144
Name: "no inline vars",
144-
Replacements: []InlineReplacement{
145+
Replacements: []blobserve_config.InlineReplacement{
145146
{Search: "aaa", Replacement: "${ide}"},
146147
{Search: "bbb", Replacement: "${supervisor}"},
147148
},
@@ -154,7 +155,7 @@ func Test_inlineVars(t *testing.T) {
154155
IDE: "foo",
155156
SupervisorImage: "bar",
156157
},
157-
Replacements: []InlineReplacement{
158+
Replacements: []blobserve_config.InlineReplacement{
158159
{Search: "aaa", Replacement: "${ide}"},
159160
{Search: "bbb", Replacement: "${supervisor}"},
160161
},

‎components/blobserve/pkg/blobserve/refstore.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
1717
"golang.org/x/xerrors"
1818

19+
blobserve_config "github.com/gitpod-io/gitpod/blobserve/pkg/config"
1920
"github.com/gitpod-io/gitpod/common-go/log"
2021
"github.com/gitpod-io/gitpod/registry-facade/pkg/registry"
2122
)
@@ -53,7 +54,7 @@ type refstore struct {
5354
once *sync.Once
5455
}
5556

56-
func newRefStore(cfg Config, resolver ResolverProvider) (*refstore, error) {
57+
func newRefStore(cfg blobserve_config.BlobServe, resolver ResolverProvider) (*refstore, error) {
5758
bs, err := newBlobSpace(cfg.BlobSpace.Location, cfg.BlobSpace.MaxSize, 10*time.Minute)
5859
if err != nil {
5960
return nil, err

‎components/blobserve/pkg/config/blobserve.go

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright (c) 2023 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License.AGPL.txt in the project root for license information.
4+
5+
package blobserve_config
6+
7+
import "github.com/gitpod-io/gitpod/common-go/util"
8+
9+
// Config configures a server.
10+
type BlobServe struct {
11+
Port int `json:"port"`
12+
Timeout util.Duration `json:"timeout,omitempty"`
13+
Repos map[string]Repo `json:"repos"`
14+
// AllowAnyRepo enables users to access any repo/image, irregardles if they're listed in the
15+
// ref config or not.
16+
AllowAnyRepo bool `json:"allowAnyRepo"`
17+
BlobSpace BlobSpace `json:"blobSpace"`
18+
}
19+
20+
type StringReplacement struct {
21+
Path string `json:"path"`
22+
Search string `json:"search"`
23+
Replacement string `json:"replacement"`
24+
}
25+
26+
type InlineReplacement struct {
27+
Search string `json:"search"`
28+
Replacement string `json:"replacement"`
29+
}
30+
31+
type Repo struct {
32+
PrePull []string `json:"prePull,omitempty"`
33+
Workdir string `json:"workdir,omitempty"`
34+
Replacements []StringReplacement `json:"replacements,omitempty"`
35+
InlineStatic []InlineReplacement `json:"inlineStatic,omitempty"`
36+
}
37+
38+
type BlobSpace struct {
39+
Location string `json:"location"`
40+
MaxSize int64 `json:"maxSizeBytes,omitempty"`
41+
}

‎components/blobserve/pkg/config/config.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22
// Licensed under the GNU Affero General Public License (AGPL).
33
// See License.AGPL.txt in the project root for license information.
44

5-
package config
5+
package blobserve_config
66

77
import (
88
"encoding/json"
99
"os"
10-
11-
"github.com/gitpod-io/gitpod/blobserve/pkg/blobserve"
1210
)
1311

1412
// Config configures this service
1513
type Config struct {
16-
BlobServe blobserve.Config `json:"blobserve"`
17-
AuthCfg string `json:"dockerAuth"`
18-
PProfAddr string `json:"pprofAddr"`
19-
PrometheusAddr string `json:"prometheusAddr"`
20-
ReadinessProbeAddr string `json:"readinessProbeAddr"`
14+
BlobServe BlobServe `json:"blobserve"`
15+
AuthCfg string `json:"dockerAuth"`
16+
PProfAddr string `json:"pprofAddr"`
17+
PrometheusAddr string `json:"prometheusAddr"`
18+
ReadinessProbeAddr string `json:"readinessProbeAddr"`
2119
}
2220

2321
// getConfig loads and validates the configuration

‎install/installer/go.mod

Lines changed: 4 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ require (
4545
sigs.k8s.io/yaml v1.3.0
4646
)
4747

48-
require cloud.google.com/go/compute/metadata v0.2.1 // indirect
48+
require (
49+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
50+
github.com/frankban/quicktest v1.14.3 // indirect
51+
)
4952

5053
require (
5154
cloud.google.com/go v0.105.0 // indirect
@@ -106,11 +109,8 @@ require (
106109
github.com/containerd/typeurl v1.0.2 // indirect
107110
github.com/containers/storage v1.39.0 // indirect
108111
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
109-
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
110112
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
111113
github.com/davecgh/go-spew v1.1.1 // indirect
112-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
113-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
114114
github.com/docker/cli v20.10.21+incompatible // indirect
115115
github.com/docker/docker v20.10.17+incompatible // indirect
116116
github.com/docker/docker-credential-helpers v0.7.0 // indirect
@@ -131,13 +131,11 @@ require (
131131
github.com/fsnotify/fsnotify v1.6.0 // indirect
132132
github.com/fvbommel/sortorder v1.0.1 // indirect
133133
github.com/gitpod-io/gitpod/content-service v0.0.0-00010101000000-000000000000 // indirect
134-
github.com/gitpod-io/gitpod/registry-facade v0.0.0-00010101000000-000000000000 // indirect
135134
github.com/gitpod-io/gitpod/usage-api v0.0.0-00010101000000-000000000000 // indirect
136135
github.com/gitpod-io/golang-crypto v0.0.0-20220823040820-b59f56dfbab3 // indirect
137136
github.com/go-errors/errors v1.0.1 // indirect
138137
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
139138
github.com/go-logr/logr v1.2.3 // indirect
140-
github.com/go-logr/stdr v1.2.2 // indirect
141139
github.com/go-ole/go-ole v1.2.6 // indirect
142140
github.com/go-openapi/jsonpointer v0.19.5 // indirect
143141
github.com/go-openapi/jsonreference v0.20.0 // indirect
@@ -146,7 +144,6 @@ require (
146144
github.com/go-playground/locales v0.14.0 // indirect
147145
github.com/go-playground/universal-translator v0.18.0 // indirect
148146
github.com/go-redis/redis/v7 v7.4.1 // indirect
149-
github.com/go-redis/redis/v8 v8.11.5 // indirect
150147
github.com/go-sql-driver/mysql v1.6.0 // indirect
151148
github.com/gobwas/glob v0.2.3 // indirect
152149
github.com/goccy/go-yaml v1.9.5 // indirect
@@ -170,40 +167,11 @@ require (
170167
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
171168
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
172169
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
173-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
174-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
175170
github.com/hashicorp/golang-lru v0.5.4 // indirect
176171
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb // indirect
177172
github.com/huandu/xstrings v1.3.2 // indirect
178173
github.com/imdario/mergo v0.3.12 // indirect
179174
github.com/inconshreveable/mousetrap v1.0.1 // indirect
180-
github.com/ipfs/bbloom v0.0.4 // indirect
181-
github.com/ipfs/go-block-format v0.0.3 // indirect
182-
github.com/ipfs/go-blockservice v0.5.0 // indirect
183-
github.com/ipfs/go-cid v0.3.2 // indirect
184-
github.com/ipfs/go-datastore v0.6.0 // indirect
185-
github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
186-
github.com/ipfs/go-ipfs-cmds v0.8.2 // indirect
187-
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
188-
github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
189-
github.com/ipfs/go-ipfs-files v0.2.0 // indirect
190-
github.com/ipfs/go-ipfs-http-client v0.4.0 // indirect
191-
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
192-
github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
193-
github.com/ipfs/go-ipld-format v0.4.0 // indirect
194-
github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
195-
github.com/ipfs/go-libipfs v0.2.0 // indirect
196-
github.com/ipfs/go-log v1.0.5 // indirect
197-
github.com/ipfs/go-log/v2 v2.5.1 // indirect
198-
github.com/ipfs/go-merkledag v0.9.0 // indirect
199-
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
200-
github.com/ipfs/go-path v0.3.0 // indirect
201-
github.com/ipfs/go-unixfs v0.4.2 // indirect
202-
github.com/ipfs/go-verifcid v0.0.2 // indirect
203-
github.com/ipfs/interface-go-ipfs-core v0.7.0 // indirect
204-
github.com/ipld/go-codec-dagpb v1.5.0 // indirect
205-
github.com/ipld/go-ipld-prime v0.19.0 // indirect
206-
github.com/jbenet/goprocess v0.1.4 // indirect
207175
github.com/jinzhu/copier v0.3.5 // indirect
208176
github.com/jinzhu/inflection v1.0.0 // indirect
209177
github.com/jinzhu/now v1.1.5 // indirect
@@ -220,16 +188,11 @@ require (
220188
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
221189
github.com/leodido/go-urn v1.2.1 // indirect
222190
github.com/lib/pq v1.10.7 // indirect
223-
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
224-
github.com/libp2p/go-libp2p v0.23.4 // indirect
225-
github.com/libp2p/go-libp2p-core v0.20.1 // indirect
226-
github.com/libp2p/go-openssl v0.1.0 // indirect
227191
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
228192
github.com/magiconair/properties v1.8.6 // indirect
229193
github.com/mailru/easyjson v0.7.6 // indirect
230194
github.com/mattn/go-colorable v0.1.13 // indirect
231195
github.com/mattn/go-isatty v0.0.17 // indirect
232-
github.com/mattn/go-pointer v0.0.1 // indirect
233196
github.com/mattn/go-runewidth v0.0.13 // indirect
234197
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
235198
github.com/mdlayher/netlink v1.4.2 // indirect
@@ -250,14 +213,6 @@ require (
250213
github.com/modern-go/reflect2 v1.0.2 // indirect
251214
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
252215
github.com/morikuni/aec v1.0.0 // indirect
253-
github.com/mr-tron/base58 v1.2.0 // indirect
254-
github.com/multiformats/go-base32 v0.1.0 // indirect
255-
github.com/multiformats/go-base36 v0.2.0 // indirect
256-
github.com/multiformats/go-multiaddr v0.8.0 // indirect
257-
github.com/multiformats/go-multibase v0.1.1 // indirect
258-
github.com/multiformats/go-multicodec v0.7.0 // indirect
259-
github.com/multiformats/go-multihash v0.2.1 // indirect
260-
github.com/multiformats/go-varint v0.0.7 // indirect
261216
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
262217
github.com/opencontainers/go-digest v1.0.0 // indirect
263218
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
@@ -268,23 +223,19 @@ require (
268223
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
269224
github.com/pkg/errors v0.9.1 // indirect
270225
github.com/pmezard/go-difflib v1.0.0 // indirect
271-
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
272226
github.com/prometheus/client_model v0.3.0 // indirect
273227
github.com/prometheus/common v0.37.0 // indirect
274228
github.com/prometheus/procfs v0.8.0 // indirect
275229
github.com/relvacode/iso8601 v1.1.0 // indirect
276230
github.com/rivo/uniseg v0.2.0 // indirect
277231
github.com/robfig/cron v1.2.0 // indirect
278-
github.com/rs/cors v1.7.0 // indirect
279232
github.com/rs/xid v1.2.1 // indirect
280233
github.com/rubenv/sql-migrate v1.1.1 // indirect
281234
github.com/russross/blackfriday v1.5.2 // indirect
282235
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
283236
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
284237
github.com/shopspring/decimal v1.2.0 // indirect
285238
github.com/slok/go-http-metrics v0.10.0 // indirect
286-
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
287-
github.com/spaolacci/murmur3 v1.1.0 // indirect
288239
github.com/spf13/cast v1.4.1 // indirect
289240
github.com/spf13/pflag v1.0.5 // indirect
290241
github.com/stripe/stripe-go/v72 v72.114.0 // indirect
@@ -297,19 +248,14 @@ require (
297248
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
298249
github.com/ulikunitz/xz v0.5.10 // indirect
299250
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
300-
github.com/whyrusleeping/cbor-gen v0.0.0-20221220214510-0333c149dec0 // indirect
301251
github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
302252
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
303253
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
304254
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
305255
github.com/yusufpapurcu/wmi v1.2.2 // indirect
306256
go.opencensus.io v0.24.0 // indirect
307-
go.opentelemetry.io/otel v1.7.0 // indirect
308-
go.opentelemetry.io/otel/trace v1.7.0 // indirect
309257
go.starlark.net v0.0.0-20200821142938-949cc6f4b097 // indirect
310258
go.uber.org/atomic v1.10.0 // indirect
311-
go.uber.org/multierr v1.9.0 // indirect
312-
go.uber.org/zap v1.24.0 // indirect
313259
golang.org/x/mod v0.7.0 // indirect
314260
golang.org/x/net v0.5.0 // indirect
315261
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
@@ -338,7 +284,6 @@ require (
338284
k8s.io/component-base v0.25.0 // indirect
339285
k8s.io/klog/v2 v2.80.1 // indirect
340286
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
341-
lukechampine.com/blake3 v1.1.7 // indirect
342287
oras.land/oras-go v1.2.0 // indirect
343288
sigs.k8s.io/controller-runtime v0.11.2 // indirect
344289
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect

0 commit comments

Comments
 (0)