Skip to content

Commit 975ad17

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #124 from sunnylovestiramisu/module-update-master-test
Update dependency go modules for k8s v1.25.0
2 parents cf245ad + 5b9ab89 commit 975ad17

File tree

1,356 files changed

+137010
-34208
lines changed

Some content is hidden

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

1,356 files changed

+137010
-34208
lines changed

‎go.mod

+52-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,63 @@
11
module github.com/kubernetes-csi/csi-lib-utils
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/container-storage-interface/spec v1.5.0
77
github.com/golang/protobuf v1.5.2
88
github.com/stretchr/testify v1.7.0
9-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
10-
google.golang.org/grpc v1.38.0
11-
k8s.io/api v0.22.0
12-
k8s.io/client-go v0.22.0
9+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
10+
google.golang.org/grpc v1.47.0
11+
k8s.io/api v0.25.0
12+
k8s.io/client-go v0.25.0
1313
k8s.io/component-base v0.22.0
14-
k8s.io/klog/v2 v2.9.0
14+
k8s.io/klog/v2 v2.70.1
1515
)
1616

17-
replace (
18-
k8s.io/api => k8s.io/api v0.22.0
19-
k8s.io/apimachinery => k8s.io/apimachinery v0.22.0
20-
k8s.io/client-go => k8s.io/client-go v0.22.0
21-
k8s.io/component-base => k8s.io/component-base v0.22.0
22-
k8s.io/node-api => k8s.io/node-api v0.22.0
17+
require (
18+
github.com/PuerkitoBio/purell v1.1.1 // indirect
19+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
20+
github.com/beorn7/perks v1.0.1 // indirect
21+
github.com/blang/semver v3.5.1+incompatible // indirect
22+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
23+
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
25+
github.com/go-logr/logr v1.2.3 // indirect
26+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
27+
github.com/go-openapi/jsonreference v0.19.5 // indirect
28+
github.com/go-openapi/swag v0.19.14 // indirect
29+
github.com/gogo/protobuf v1.3.2 // indirect
30+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
31+
github.com/google/gnostic v0.5.7-v3refs // indirect
32+
github.com/google/gofuzz v1.1.0 // indirect
33+
github.com/josharian/intern v1.0.0 // indirect
34+
github.com/json-iterator/go v1.1.12 // indirect
35+
github.com/mailru/easyjson v0.7.6 // indirect
36+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
37+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
38+
github.com/modern-go/reflect2 v1.0.2 // indirect
39+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
40+
github.com/pmezard/go-difflib v1.0.0 // indirect
41+
github.com/prometheus/client_golang v1.12.1 // indirect
42+
github.com/prometheus/client_model v0.2.0 // indirect
43+
github.com/prometheus/common v0.32.1 // indirect
44+
github.com/prometheus/procfs v0.7.3 // indirect
45+
github.com/spf13/pflag v1.0.5 // indirect
46+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
47+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
48+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
49+
golang.org/x/text v0.3.7 // indirect
50+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
51+
google.golang.org/appengine v1.6.7 // indirect
52+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
53+
google.golang.org/protobuf v1.28.0 // indirect
54+
gopkg.in/inf.v0 v0.9.1 // indirect
55+
gopkg.in/yaml.v2 v2.4.0 // indirect
56+
gopkg.in/yaml.v3 v3.0.1 // indirect
57+
k8s.io/apimachinery v0.25.0 // indirect
58+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
59+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
60+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
61+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
62+
sigs.k8s.io/yaml v1.2.0 // indirect
2363
)

‎go.sum

+155-33
Large diffs are not rendered by default.

‎release-tools/filter-junit.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ type TestCase struct {
5656
Name string `xml:"name,attr"`
5757
Time string `xml:"time,attr"`
5858
SystemOut string `xml:"system-out,omitempty"`
59+
SystemErr string `xml:"system-err,omitempty"`
5960
Failure string `xml:"failure,omitempty"`
6061
Skipped SkipReason `xml:"skipped,omitempty"`
6162
}
@@ -109,7 +110,7 @@ func main() {
109110
if err := xml.Unmarshal(data, &junitv2); err != nil {
110111
panic(err)
111112
}
112-
junit = junitv2.TestSuite
113+
junit.TestCases = append(junit.TestCases, junitv2.TestSuite.TestCases...)
113114
}
114115
}
115116

‎release-tools/prow.sh

+10-5
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,10 @@ run_e2e () (
10081008
# the full Kubernetes E2E testsuite while only running a few tests.
10091009
move_junit () {
10101010
if ls "${ARTIFACTS}"/junit_[0-9]*.xml 2>/dev/null >/dev/null; then
1011-
run_filter_junit -t="External.Storage|CSI.mock.volume" -o "${ARTIFACTS}/junit_${name}.xml" "${ARTIFACTS}"/junit_[0-9]*.xml && rm -f "${ARTIFACTS}"/junit_[0-9]*.xml
1011+
mkdir -p "${ARTIFACTS}/junit/${name}" &&
1012+
mkdir -p "${ARTIFACTS}/junit/steps" &&
1013+
run_filter_junit -t="External.Storage|CSI.mock.volume" -o "${ARTIFACTS}/junit/steps/junit_${name}.xml" "${ARTIFACTS}"/junit_[0-9]*.xml &&
1014+
mv "${ARTIFACTS}"/junit_[0-9]*.xml "${ARTIFACTS}/junit/${name}/"
10121015
fi
10131016
}
10141017
trap move_junit EXIT
@@ -1085,13 +1088,14 @@ kubectl exec "$pod" -c "${CSI_PROW_SANITY_CONTAINER}" -- /bin/sh -c "\${CHECK_PA
10851088
EOF
10861089
10871090
chmod u+x "${CSI_PROW_WORK}"/*dir_in_pod.sh
1091+
mkdir -p "${ARTIFACTS}/junit/steps"
10881092
10891093
# This cannot run in parallel, because -csi.junitfile output
10901094
# from different Ginkgo nodes would go to the same file. Also the
10911095
# staging and target directories are the same.
10921096
run_with_loggers "${CSI_PROW_WORK}/csi-sanity" \
10931097
-ginkgo.v \
1094-
-csi.junitfile "${ARTIFACTS}/junit_sanity.xml" \
1098+
-csi.junitfile "${ARTIFACTS}/junit/steps/junit_sanity.xml" \
10951099
-csi.endpoint "dns:///$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' csi-prow-control-plane):$(kubectl get "services/${CSI_PROW_SANITY_SERVICE}" -o "jsonpath={..nodePort}")" \
10961100
-csi.stagingdir "/tmp/staging" \
10971101
-csi.mountdir "/tmp/mount" \
@@ -1121,7 +1125,8 @@ make_test_to_junit () {
11211125
# Plain make-test.xml was not delivered as text/xml by the web
11221126
# server and ignored by spyglass. It seems that the name has to
11231127
# match junit*.xml.
1124-
out="${ARTIFACTS}/junit_make_test.xml"
1128+
out="${ARTIFACTS}/junit/steps/junit_make_test.xml"
1129+
mkdir -p "$(dirname "$out")"
11251130
testname=
11261131
echo "<testsuite>" >>"$out"
11271132
@@ -1385,8 +1390,8 @@ main () {
13851390
fi
13861391
13871392
# Merge all junit files into one. This gets rid of duplicated "skipped" tests.
1388-
if ls "${ARTIFACTS}"/junit_*.xml 2>/dev/null >&2; then
1389-
run_filter_junit -o "${CSI_PROW_WORK}/junit_final.xml" "${ARTIFACTS}"/junit_*.xml && rm "${ARTIFACTS}"/junit_*.xml && mv "${CSI_PROW_WORK}/junit_final.xml" "${ARTIFACTS}"
1393+
if ls "${ARTIFACTS}"/junit/steps/junit_*.xml 2>/dev/null >&2; then
1394+
run_filter_junit -o "${ARTIFACTS}/junit_final.xml" "${ARTIFACTS}"/junit/steps/junit_*.xml
13901395
fi
13911396
13921397
return "$ret"

‎vendor/github.com/PuerkitoBio/purell/.gitignore

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

‎vendor/github.com/PuerkitoBio/purell/.travis.yml

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

‎vendor/github.com/PuerkitoBio/purell/LICENSE

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

‎vendor/github.com/PuerkitoBio/purell/README.md

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

0 commit comments

Comments
 (0)