Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to install meta components to GKE with InCluster dependencies #6355

Merged
merged 5 commits into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions components/openvsx-proxy/BUILD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@ packages:
- GOOS=linux
config:
packaging: app
- name: lib
type: go
deps:
- components/common-go:lib
srcs:
- "**/*.go"
- "go.mod"
- "go.sum"
env:
- CGO_ENABLED=0
- GOOS=linux
config:
packaging: library
dontTest: false
- name: docker
type: docker
deps:
Expand Down
1 change: 1 addition & 0 deletions installer/BUILD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ packages:
- components/registry-facade:lib
- components/ws-daemon-api/go:lib
- components/ws-proxy:lib
- components/openvsx-proxy:lib
env:
- CGO_ENABLED=0
config:
Expand Down
21 changes: 14 additions & 7 deletions installer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
github.com/gitpod-io/gitpod/content-service/api v0.0.0-00010101000000-000000000000
github.com/gitpod-io/gitpod/image-builder/api v0.0.0-00010101000000-000000000000
github.com/gitpod-io/gitpod/openvsx-proxy v0.0.0-00010101000000-000000000000
github.com/gitpod-io/gitpod/registry-facade/api v0.0.0-00010101000000-000000000000
github.com/gitpod-io/gitpod/ws-daemon v0.0.0-00010101000000-000000000000
github.com/gitpod-io/gitpod/ws-daemon/api v0.0.0-00010101000000-000000000000
Expand Down Expand Up @@ -53,9 +54,11 @@ require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
github.com/allegro/bigcache v1.2.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
Expand All @@ -76,6 +79,7 @@ require (
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/eko/gocache v1.1.1 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/camelcase v1.0.0 // indirect
Expand All @@ -96,6 +100,7 @@ require (
github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-redis/redis/v7 v7.4.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/godbus/dbus/v5 v5.0.4 // indirect
github.com/gogo/googleapis v1.4.0 // indirect
Expand All @@ -105,7 +110,7 @@ require (
github.com/google/btree v1.0.1 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
Expand Down Expand Up @@ -216,6 +221,14 @@ require (

replace github.com/gitpod-io/gitpod/image-builder => ../components/image-builder-mk3 // leeway

replace github.com/gitpod-io/gitpod/image-builder/api => ../components/image-builder-api/go // leeway

replace github.com/gitpod-io/gitpod/openvsx-proxy => ../components/openvsx-proxy // leeway

replace github.com/gitpod-io/gitpod/ws-scheduler => ../components/ee/ws-scheduler // leeway

replace github.com/gitpod-io/gitpod/ws-proxy => ../components/ws-proxy // leeway

replace github.com/gitpod-io/gitpod/agent-smith => ../components/ee/agent-smith // leeway

replace github.com/gitpod-io/gitpod/blobserve => ../components/blobserve // leeway
Expand All @@ -228,8 +241,6 @@ replace github.com/gitpod-io/gitpod/content-service/api => ../components/content

replace github.com/gitpod-io/gitpod/gitpod-protocol => ../components/gitpod-protocol/go // leeway

replace github.com/gitpod-io/gitpod/image-builder/api => ../components/image-builder-api/go // leeway

replace github.com/gitpod-io/gitpod/registry-facade => ../components/registry-facade // leeway

replace github.com/gitpod-io/gitpod/registry-facade/api => ../components/registry-facade-api/go // leeway
Expand All @@ -240,10 +251,6 @@ replace github.com/gitpod-io/gitpod/ws-daemon/api => ../components/ws-daemon-api

replace github.com/gitpod-io/gitpod/ws-manager/api => ../components/ws-manager-api/go // leeway

replace github.com/gitpod-io/gitpod/ws-proxy => ../components/ws-proxy // leeway

replace github.com/gitpod-io/gitpod/ws-scheduler => ../components/ee/ws-scheduler // leeway

replace k8s.io/api => k8s.io/api v0.22.2 // leeway indirect from components/common-go:lib

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.2 // leeway indirect from components/common-go:lib
Expand Down
Loading