x

Author: corneliusludmann

components/blobserve/go.mod

@@ -47,7 +47,7 @@ do
             fi
 
             if  grep -q "${p}" go.mod && ! grep -q "${p} v${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}" go.mod; then
-                go get "${p}"@v"${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}"
+                #go get "${p}"@v"${WORKSPACE_CLUSTER_DEPENDENCIES[${key}]}"
                 # shellcheck disable=SC2076
                 if [[ ! " ${COMPONENTS_TO_TEST[*]} " =~ " ${FOLDER} " ]]; then
                     COMPONENTS_TO_TEST+=("${FOLDER}")
@@ -60,6 +60,8 @@ do
     done
 done
 
+leeway link
+
 echo ""
 echo "========== Done updating, doing tidy and testing now =========="
 echo ""
@@ -76,12 +78,16 @@ do
         continue
     fi
 
+    if [[ "${t}" == "components/docker-up" ]]; then
+        continue
+    fi
+
     pushd "${t}"
     echo "+++++ $t"
     # clean it up
     go mod tidy
-    leeway link .
-    go mod tidy
+    # leeway link .
+    # go mod tidy
     # assert that build and tests pass
 
 

components/blobserve/go.sum

@@ -16,7 +16,7 @@ require (
 	github.com/hashicorp/golang-lru v1.0.2
 	github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
 	github.com/opentracing/opentracing-go v1.2.0
-	github.com/prometheus/client_golang v1.16.0
+	github.com/prometheus/client_golang v1.19.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/slok/go-http-metrics v0.10.0
 	github.com/stretchr/testify v1.9.0
@@ -25,10 +25,10 @@ require (
 	golang.org/x/sys v0.21.0
 	golang.org/x/time v0.3.0
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
-	google.golang.org/grpc v1.58.3
+	google.golang.org/grpc v1.65.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/segmentio/analytics-go.v3 v3.1.0
-	k8s.io/api v0.30.9
+	k8s.io/api v0.31.9
 	k8s.io/apimachinery v0.31.9
 )
 
@@ -37,37 +37,37 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cilium/ebpf v0.4.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cilium/ebpf v0.7.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/godbus/dbus/v5 v5.0.4 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/opencontainers/runtime-spec v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/goleak v1.2.1 // indirect
+	go.uber.org/goleak v1.3.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -128,12 +128,12 @@ replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.9
 
 replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.9
 
-replace github.com/gitpod-io/gitpod/components/scrubber => ../scrubber // leeway
-
 replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.9
 
 replace k8s.io/endpointslice => k8s.io/endpointslice v0.31.9
 
 replace k8s.io/kms => k8s.io/kms v0.31.9
 
 replace k8s.io/cri-client => k8s.io/cri-client v0.31.9
+
+replace github.com/gitpod-io/gitpod/components/scrubber => ../scrubber // leeway