Skip to content

Commit b22bf9d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into system-benchmarks-improvements
2 parents 1ec12e8 + b0a1876 commit b22bf9d

File tree

4 files changed

+60
-107
lines changed

4 files changed

+60
-107
lines changed

.buildkite/scripts/integration_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ upload_safe_logs() {
9292
gsutil cp ${source} "gs://${bucket}/buildkite/${REPO_BUILD_TAG}/${target}"
9393

9494
rm -rf "${gsUtilLocation}"
95-
unset GOOGLE_APPLICATIONS_CREDENTIALS
95+
unset GOOGLE_APPLICATION_CREDENTIALS
9696
}
9797

9898
add_bin_path

.buildkite/scripts/tooling.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ google_cloud_auth() {
2222

2323
gcloud auth activate-service-account --key-file ${keyFile} 2> /dev/null
2424

25-
export GOOGLE_APPLICATIONS_CREDENTIALS=${secretFileLocation}
25+
export GOOGLE_APPLICATION_CREDENTIALS=${secretFileLocation}
2626
}
2727

2828
retry() {
@@ -44,4 +44,3 @@ retry() {
4444
done
4545
return 0
4646
}
47-

go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ require (
3535
gopkg.in/yaml.v3 v3.0.1
3636
gotest.tools/gotestsum v1.10.1
3737
helm.sh/helm/v3 v3.12.3
38-
honnef.co/go/tools v0.4.3
39-
k8s.io/apimachinery v0.27.4
40-
k8s.io/cli-runtime v0.27.4
41-
k8s.io/client-go v0.27.4
38+
honnef.co/go/tools v0.4.5
39+
k8s.io/apimachinery v0.28.0
40+
k8s.io/cli-runtime v0.28.0
41+
k8s.io/client-go v0.28.0
4242
)
4343

4444
require (
@@ -72,19 +72,19 @@ require (
7272
github.com/fsnotify/fsnotify v1.6.0 // indirect
7373
github.com/go-errors/errors v1.4.2 // indirect
7474
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
75-
github.com/go-logr/logr v1.2.3 // indirect
75+
github.com/go-logr/logr v1.2.4 // indirect
7676
github.com/go-ole/go-ole v1.2.6 // indirect
7777
github.com/go-openapi/errors v0.20.3 // indirect
7878
github.com/go-openapi/jsonpointer v0.19.6 // indirect
79-
github.com/go-openapi/jsonreference v0.20.1 // indirect
79+
github.com/go-openapi/jsonreference v0.20.2 // indirect
8080
github.com/go-openapi/strfmt v0.21.3 // indirect
8181
github.com/go-openapi/swag v0.22.3 // indirect
8282
github.com/gogo/protobuf v1.3.2 // indirect
8383
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8484
github.com/golang/protobuf v1.5.3 // indirect
8585
github.com/golang/snappy v0.0.4 // indirect
8686
github.com/google/btree v1.1.2 // indirect
87-
github.com/google/gnostic v0.6.9 // indirect
87+
github.com/google/gnostic-models v0.6.8 // indirect
8888
github.com/google/gofuzz v1.2.0 // indirect
8989
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9090
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -141,35 +141,35 @@ require (
141141
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
142142
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
143143
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
144-
github.com/xlab/treeprint v1.1.0 // indirect
144+
github.com/xlab/treeprint v1.2.0 // indirect
145145
github.com/yusufpapurcu/wmi v1.2.3 // indirect
146146
go.mongodb.org/mongo-driver v1.11.1 // indirect
147-
go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect
147+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
148148
golang.org/x/crypto v0.12.0 // indirect
149149
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
150150
golang.org/x/mod v0.12.0 // indirect
151151
golang.org/x/net v0.14.0 // indirect
152-
golang.org/x/oauth2 v0.4.0 // indirect
152+
golang.org/x/oauth2 v0.8.0 // indirect
153153
golang.org/x/sync v0.3.0 // indirect
154154
golang.org/x/sys v0.11.0 // indirect
155155
golang.org/x/term v0.11.0 // indirect
156156
golang.org/x/text v0.12.0 // indirect
157157
golang.org/x/time v0.3.0 // indirect
158158
google.golang.org/appengine v1.6.7 // indirect
159-
google.golang.org/protobuf v1.28.1 // indirect
159+
google.golang.org/protobuf v1.30.0 // indirect
160160
gopkg.in/inf.v0 v0.9.1 // indirect
161161
gopkg.in/warnings.v0 v0.1.2 // indirect
162162
gopkg.in/yaml.v2 v2.4.0 // indirect
163-
k8s.io/api v0.27.4 // indirect
163+
k8s.io/api v0.28.0 // indirect
164164
k8s.io/apiextensions-apiserver v0.27.3 // indirect
165-
k8s.io/component-base v0.27.3 // indirect
165+
k8s.io/component-base v0.28.0 // indirect
166166
k8s.io/klog/v2 v2.100.1 // indirect
167-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
168-
k8s.io/kubectl v0.27.3 // indirect
169-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
167+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
168+
k8s.io/kubectl v0.28.0 // indirect
169+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
170170
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
171-
sigs.k8s.io/kustomize/api v0.13.2 // indirect
172-
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
171+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
172+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
173173
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
174174
sigs.k8s.io/yaml v1.3.0 // indirect
175175
)

0 commit comments

Comments
 (0)