Skip to content

Commit 09b7fb8

Browse files
authored
Merge pull request #773 from MartinForReal/shafan/boskos
Replace boskos client with the one in sigs.k8s.io/boskos
2 parents 5953ba1 + e14abd4 commit 09b7fb8

File tree

35 files changed

+1690
-514
lines changed

35 files changed

+1690
-514
lines changed

Diff for: go.mod

+11-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
require (
66
cloud.google.com/go/compute/metadata v0.2.3
77
code.cloudfoundry.org/clock v1.1.0
8-
contrib.go.opencensus.io/exporter/prometheus v0.0.0-20190427222117-f6cda26f80a3
8+
contrib.go.opencensus.io/exporter/prometheus v0.1.0
99
contrib.go.opencensus.io/exporter/stackdriver v0.13.4
1010
github.com/acobaugh/osrelease v0.1.0
1111
github.com/avast/retry-go v3.0.0+incompatible
@@ -28,12 +28,12 @@ require (
2828
golang.org/x/oauth2 v0.9.0
2929
golang.org/x/sys v0.9.0
3030
google.golang.org/api v0.114.0
31-
k8s.io/api v0.17.2
32-
k8s.io/apimachinery v0.17.2
31+
k8s.io/api v0.17.3
32+
k8s.io/apimachinery v0.17.3
3333
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
3434
k8s.io/component-base v0.17.2
3535
k8s.io/klog v1.0.0
36-
k8s.io/test-infra v0.0.0-20190914015041-e1cbc3ccd91c
36+
sigs.k8s.io/boskos v0.0.0-20200515170311-7d36bde8cdf6
3737
)
3838

3939
require (
@@ -54,14 +54,14 @@ require (
5454
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5555
github.com/golang/protobuf v1.5.3 // indirect
5656
github.com/google/go-cmp v0.5.9 // indirect
57-
github.com/google/gofuzz v1.0.0 // indirect
57+
github.com/google/gofuzz v1.1.0 // indirect
5858
github.com/google/uuid v1.3.0 // indirect
5959
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
6060
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
6161
github.com/googleapis/gnostic v0.3.1 // indirect
62-
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
63-
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 // indirect
64-
github.com/imdario/mergo v0.3.7 // indirect
62+
github.com/hashicorp/errwrap v1.0.0 // indirect
63+
github.com/hashicorp/go-multierror v1.0.0 // indirect
64+
github.com/imdario/mergo v0.3.8 // indirect
6565
github.com/jmespath/go-jmespath v0.4.0 // indirect
6666
github.com/json-iterator/go v1.1.12 // indirect
6767
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
@@ -94,8 +94,9 @@ require (
9494
gopkg.in/yaml.v2 v2.4.0 // indirect
9595
gopkg.in/yaml.v3 v3.0.1 // indirect
9696
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
97-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
98-
sigs.k8s.io/yaml v1.1.0 // indirect
97+
k8s.io/test-infra v0.0.0-20200514184223-ba32c8aae783 // indirect
98+
k8s.io/utils v0.0.0-20200122174043-1e243dd1a584 // indirect
99+
sigs.k8s.io/yaml v1.2.0 // indirect
99100
)
100101

101102
replace (

Diff for: go.sum

+510-126
Large diffs are not rendered by default.

Diff for: test/e2e/metriconly/e2e_npd_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"k8s.io/node-problem-detector/pkg/util/tomb"
2929
"k8s.io/node-problem-detector/test/e2e/lib/gce"
30-
"k8s.io/test-infra/boskos/client"
30+
"sigs.k8s.io/boskos/client"
3131

3232
"github.com/onsi/ginkgo"
3333
"github.com/onsi/ginkgo/config"
@@ -101,7 +101,9 @@ func rentBoskosProjectIfNeededOnNode1() []byte {
101101
}
102102

103103
fmt.Printf("Renting project from Boskos\n")
104-
boskosClient = client.NewClient(*jobName, *boskosServerURL)
104+
var err error
105+
boskosClient, err = client.NewClient(*jobName, *boskosServerURL, "", "")
106+
Expect(err).NotTo(HaveOccurred())
105107
boskosRenewingTomb = tomb.NewTomb()
106108

107109
ctx, cancel := context.WithTimeout(context.Background(), *boskosWaitDuration)

Diff for: vendor/github.com/google/gofuzz/README.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/google/gofuzz/fuzz.go

+27-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/hashicorp/errwrap/README.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/hashicorp/go-multierror/format.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/hashicorp/go-multierror/sort.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/imdario/mergo/.travis.yml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/github.com/imdario/mergo/merge.go

+39-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vendor/k8s.io/test-infra/prow/config/secret/BUILD.bazel

+42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)