Skip to content

Commit 64cb1b2

Browse files
geroplgeropl
committed
wip
Tool: gitpod/catfood.gitpod.cloud
1 parent 2d66859 commit 64cb1b2

File tree

86 files changed

+889
-1014
lines changed

Some content is hidden

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

86 files changed

+889
-1014
lines changed

‎WORKSPACE.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ defaultVariant:
3838
- GOARCH=amd64
3939
- DOCKER_DEFAULT_PLATFORM=linux/amd64
4040
- NODE_OPTIONS=--max_old_space_size=8192
41+
- LEEWAY_BUILD=true
4142
srcs:
4243
exclude:
4344
# Make sure we don't include node_modules/**/*.ts by accident

‎components/blobserve/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
1414
github.com/opencontainers/image-spec v1.1.0
1515
github.com/prometheus/client_golang v1.18.0
16-
github.com/spf13/cobra v1.6.0
16+
github.com/spf13/cobra v1.7.0
1717
golang.org/x/sync v0.6.0
1818
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
1919
)
@@ -33,7 +33,7 @@ require (
3333
github.com/docker/docker-credential-helpers v0.8.0 // indirect
3434
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect
3535
github.com/felixge/httpsnoop v1.0.4 // indirect
36-
github.com/fsnotify/fsnotify v1.6.0 // indirect
36+
github.com/fsnotify/fsnotify v1.7.0 // indirect
3737
github.com/gitpod-io/gitpod/components/scrubber v0.0.0-00010101000000-000000000000 // indirect
3838
github.com/gitpod-io/gitpod/registry-facade/api v0.0.0-00010101000000-000000000000 // indirect
3939
github.com/go-logr/logr v1.4.1 // indirect
@@ -52,7 +52,7 @@ require (
5252
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
5353
github.com/hashicorp/golang-lru v1.0.2 // indirect
5454
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
55-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
55+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5656
github.com/ipfs/bbloom v0.0.4 // indirect
5757
github.com/ipfs/boxo v0.18.0 // indirect
5858
github.com/ipfs/go-bitfield v1.1.0 // indirect

‎components/blobserve/go.sum

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/common-go/go-update-wc-deps.sh

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ declare -A WORKSPACE_CLUSTER_DEPENDENCIES
1717
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/containerd/containerd"]="1.6.36"
1818
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/moby/buildkit"]="0.12.5"
1919
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/opencontainers/runc"]="1.1.14"
20+
WORKSPACE_CLUSTER_DEPENDENCIES["k8s.io/"]="1.30.9"
2021

2122
# loop through keys of each associative array
2223
for key in "${!WORKSPACE_CLUSTER_DEPENDENCIES[@]}"
@@ -33,24 +34,61 @@ do
3334
FOLDER="$(dirname "${c}")"
3435
pushd "${FOLDER}"
3536

36-
if grep -q "${key}" go.mod && ! grep -q "${key} v${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}" go.mod; then
37-
go get "${key}"@v"${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}"
38-
# shellcheck disable=SC2076
39-
if [[ ! " ${COMPONENTS_TO_TEST[*]} " =~ " ${FOLDER} " ]]; then
40-
COMPONENTS_TO_TEST+=("${FOLDER}")
37+
# list all package to update, in case "key" is a prefix
38+
PACKAGES=$(grep -o "[[:space:]]${key}[^ ]*" go.mod | tr -d "[:blank:]" | sort | uniq)
39+
for p in ${PACKAGES}; do
40+
if [[ "$p" == k8s.io/klog* ]] || [[ "$p" == k8s.io/utils* ]] || [[ "$p" == k8s.io/kube-openapi* ]] || [[ "$p" == k8s.io/api* ]] || [[ "$p" == k8s.io/client-go* ]] || [[ "$p" == k8s.io/gengo* ]] || [[ "$p" == k8s.io/kms* ]]; then
41+
# special case imported indirectly, we don't want to update it
42+
echo "Ignoring ${p}..."
43+
continue
4144
fi
42-
fi
45+
46+
if grep -q "${p}" go.mod && ! grep -q "${p} v${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}" go.mod; then
47+
go get "${p}"@v"${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}"
48+
# shellcheck disable=SC2076
49+
if [[ ! " ${COMPONENTS_TO_TEST[*]} " =~ " ${FOLDER} " ]]; then
50+
COMPONENTS_TO_TEST+=("${FOLDER}")
51+
fi
52+
fi
53+
done
4354

4455
popd
4556
done
4657
done
4758

59+
echo ""
60+
echo "========== Done updating, doing tidy and testing now =========="
61+
echo ""
62+
63+
INSTALLER_PACKAGE=""
64+
4865
for t in "${COMPONENTS_TO_TEST[@]}"
4966
do
67+
if [[ "${t}" == "install/installer" ]]; then
68+
# do after all others, as it's depending on all other packages
69+
INSTALLER_PACKAGE="${t}"
70+
continue
71+
fi
72+
5073
pushd "${t}"
5174
# clean it up
5275
go mod tidy
5376
# assert that build and tests pass
54-
go test ./...
77+
78+
79+
if [[ "${t}" == "test" ]]; then
80+
echo "Skipping tests for ${t}"
81+
else
82+
go test ./...
83+
fi
5584
popd
5685
done
86+
87+
if [[ -n "${INSTALLER_PACKAGE}" ]]; then
88+
pushd "${INSTALLER_PACKAGE}"
89+
# clean it up
90+
go mod tidy
91+
# assert that build and tests pass
92+
go test ./...
93+
popd
94+
fi

‎components/common-go/go.mod

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22
55
require (
66
github.com/configcat/go-sdk/v7 v7.6.0
77
github.com/containerd/cgroups v1.0.4
8-
github.com/fsnotify/fsnotify v1.4.9
8+
github.com/fsnotify/fsnotify v1.7.0
99
github.com/gitpod-io/gitpod/components/scrubber v0.0.0-00010101000000-000000000000
1010
github.com/go-test/deep v1.0.5
1111
github.com/google/go-cmp v0.6.0
@@ -19,11 +19,11 @@ require (
1919
github.com/slok/go-http-metrics v0.10.0
2020
github.com/stretchr/testify v1.8.4
2121
github.com/uber/jaeger-client-go v2.29.1+incompatible
22-
golang.org/x/sync v0.2.0
22+
golang.org/x/sync v0.5.0
2323
golang.org/x/sys v0.15.0
2424
golang.org/x/time v0.3.0
25-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
26-
google.golang.org/grpc v1.52.3
25+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
26+
google.golang.org/grpc v1.58.3
2727
google.golang.org/protobuf v1.33.0
2828
gopkg.in/segmentio/analytics-go.v3 v3.1.0
2929
k8s.io/api v0.29.3
@@ -37,7 +37,7 @@ require (
3737
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
3838
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3939
github.com/cilium/ebpf v0.4.0 // indirect
40-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
40+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/docker/go-units v0.4.0 // indirect
4343
github.com/go-logr/logr v1.3.0 // indirect
@@ -53,16 +53,17 @@ require (
5353
github.com/opencontainers/runtime-spec v1.0.2 // indirect
5454
github.com/pkg/errors v0.9.1 // indirect
5555
github.com/pmezard/go-difflib v1.0.0 // indirect
56-
github.com/prometheus/client_model v0.3.0 // indirect
57-
github.com/prometheus/common v0.42.0 // indirect
56+
github.com/prometheus/client_model v0.4.0 // indirect
57+
github.com/prometheus/common v0.44.0 // indirect
5858
github.com/prometheus/procfs v0.10.1 // indirect
5959
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
6060
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
6161
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
62-
go.uber.org/atomic v1.4.0 // indirect
62+
go.uber.org/atomic v1.10.0 // indirect
63+
go.uber.org/goleak v1.2.1 // indirect
6364
golang.org/x/net v0.19.0 // indirect
6465
golang.org/x/text v0.14.0 // indirect
65-
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
66+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
6667
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
6768
gopkg.in/inf.v0 v0.9.1 // indirect
6869
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)