Merge pull request #828 from sunnylovestiramisu/module-update-master
Update dependency go modules for k8s v1.27.0
This commit is contained in:
68
go.mod
68
go.mod
@@ -1,6 +1,6 @@
|
||||
module github.com/kubernetes-csi/external-snapshotter/v6
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/container-storage-interface/spec v1.7.0
|
||||
@@ -17,13 +17,13 @@ require (
|
||||
github.com/prometheus/common v0.37.0
|
||||
github.com/spf13/cobra v1.6.1
|
||||
google.golang.org/grpc v1.51.0
|
||||
k8s.io/api v0.27.0-rc.0
|
||||
k8s.io/apimachinery v0.27.0-rc.0
|
||||
k8s.io/client-go v0.27.0-rc.0
|
||||
k8s.io/component-base v0.27.0-rc.0
|
||||
k8s.io/component-helpers v0.27.0-rc.0
|
||||
k8s.io/api v0.27.0
|
||||
k8s.io/apimachinery v0.27.0
|
||||
k8s.io/client-go v0.27.0
|
||||
k8s.io/component-base v0.27.0
|
||||
k8s.io/component-helpers v0.27.0
|
||||
k8s.io/klog/v2 v2.90.1
|
||||
k8s.io/kubernetes v1.27.0-rc.0
|
||||
k8s.io/kubernetes v1.27.0
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -75,56 +75,56 @@ require (
|
||||
|
||||
replace github.com/kubernetes-csi/external-snapshotter/client/v6 => ./client
|
||||
|
||||
replace k8s.io/api => k8s.io/api v0.27.0-rc.0
|
||||
replace k8s.io/api => k8s.io/api v0.27.0
|
||||
|
||||
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0-rc.0
|
||||
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0
|
||||
|
||||
replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.0-rc.0
|
||||
replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.0
|
||||
|
||||
replace k8s.io/apiserver => k8s.io/apiserver v0.27.0-rc.0
|
||||
replace k8s.io/apiserver => k8s.io/apiserver v0.27.0
|
||||
|
||||
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0-rc.0
|
||||
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0
|
||||
|
||||
replace k8s.io/client-go => k8s.io/client-go v0.27.0-rc.0
|
||||
replace k8s.io/client-go => k8s.io/client-go v0.27.0
|
||||
|
||||
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0-rc.0
|
||||
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0
|
||||
|
||||
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0-rc.0
|
||||
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0
|
||||
|
||||
replace k8s.io/code-generator => k8s.io/code-generator v0.27.0-rc.0
|
||||
replace k8s.io/code-generator => k8s.io/code-generator v0.27.0
|
||||
|
||||
replace k8s.io/component-base => k8s.io/component-base v0.27.0-rc.0
|
||||
replace k8s.io/component-base => k8s.io/component-base v0.27.0
|
||||
|
||||
replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.0-rc.0
|
||||
replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.0
|
||||
|
||||
replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.0-rc.0
|
||||
replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.0
|
||||
|
||||
replace k8s.io/cri-api => k8s.io/cri-api v0.27.0-rc.0
|
||||
replace k8s.io/cri-api => k8s.io/cri-api v0.27.0
|
||||
|
||||
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0-rc.0
|
||||
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0
|
||||
|
||||
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.0-rc.0
|
||||
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.0
|
||||
|
||||
replace k8s.io/kms => k8s.io/kms v0.27.0-rc.0
|
||||
replace k8s.io/kms => k8s.io/kms v0.27.0
|
||||
|
||||
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.0-rc.0
|
||||
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.0
|
||||
|
||||
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.0-rc.0
|
||||
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.0
|
||||
|
||||
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.0-rc.0
|
||||
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.0
|
||||
|
||||
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0-rc.0
|
||||
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0
|
||||
|
||||
replace k8s.io/kubectl => k8s.io/kubectl v0.27.0-rc.0
|
||||
replace k8s.io/kubectl => k8s.io/kubectl v0.27.0
|
||||
|
||||
replace k8s.io/kubelet => k8s.io/kubelet v0.27.0-rc.0
|
||||
replace k8s.io/kubelet => k8s.io/kubelet v0.27.0
|
||||
|
||||
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0-rc.0
|
||||
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0
|
||||
|
||||
replace k8s.io/metrics => k8s.io/metrics v0.27.0-rc.0
|
||||
replace k8s.io/metrics => k8s.io/metrics v0.27.0
|
||||
|
||||
replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.0-rc.0
|
||||
replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.0
|
||||
|
||||
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0-rc.0
|
||||
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0
|
||||
|
||||
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0-rc.0
|
||||
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0
|
||||
|
26
go.sum
26
go.sum
@@ -273,7 +273,7 @@ github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0ua
|
||||
github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
|
||||
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
@@ -641,24 +641,24 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
k8s.io/api v0.27.0-rc.0 h1:UPcnGAd8whT0wmg+Udxqlu1WmHSa8WMGRSDe4MgVqfw=
|
||||
k8s.io/api v0.27.0-rc.0/go.mod h1:FN4d1ky4VQk0kBLFvE+gApcATfTE1gCW+8b98AuGcFw=
|
||||
k8s.io/apimachinery v0.27.0-rc.0 h1:tZLz1KvV+75lryHn+A7GlgY3ZJOfyhMllgSQehHbYqA=
|
||||
k8s.io/apimachinery v0.27.0-rc.0/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
|
||||
k8s.io/client-go v0.27.0-rc.0 h1:AxH8b1EEme8K7fk3ZLIQ03K+a5tzuiRxvrvVZfD1UpU=
|
||||
k8s.io/client-go v0.27.0-rc.0/go.mod h1:4wSL4CxTF72/JEeRmXbSDOYrw7PkPwgtPQ5Apo+k1ZM=
|
||||
k8s.io/component-base v0.27.0-rc.0 h1:JRnt79bHNknixTveB9hgkOYEkuSUDPGs2OXYblb9x4s=
|
||||
k8s.io/component-base v0.27.0-rc.0/go.mod h1:peCbfN0jbpp37avwTEyTdAkTvRRu3yXYtiYLYS0bCXY=
|
||||
k8s.io/component-helpers v0.27.0-rc.0 h1:/Vx+QKkiJg4n4qTmc9VgpJ5WDtfltaZHKFgdqZ4CQbA=
|
||||
k8s.io/component-helpers v0.27.0-rc.0/go.mod h1:btg5UnNKqf+9mA4hHmO6oO0N6lGnHcYAMBDRjstwATo=
|
||||
k8s.io/api v0.27.0 h1:2owttiA8Oa+J3idFeq8TSnNpm4y6AOGPI3PDbIpp2cE=
|
||||
k8s.io/api v0.27.0/go.mod h1:Wl+QRvQlh+T8SK5f4F6YBhhyH6hrFO08nl74xZb1MUE=
|
||||
k8s.io/apimachinery v0.27.0 h1:vEyy/PVMbPMCPutrssCVHCf0JNZ0Px+YqPi82K2ALlk=
|
||||
k8s.io/apimachinery v0.27.0/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
|
||||
k8s.io/client-go v0.27.0 h1:DyZS1fJkv73tEy7rWv4VF6NwGeJ7SKvNaLRXZBYLA+4=
|
||||
k8s.io/client-go v0.27.0/go.mod h1:XVEmpNnM+4JYO3EENoFV/ZDv3KxKVJUnzGo70avk+C4=
|
||||
k8s.io/component-base v0.27.0 h1:g3/FkscH8Uqg9SiDCEfhfhTVwKiVo4T2+iBwUqiFkMg=
|
||||
k8s.io/component-base v0.27.0/go.mod h1:PXyBQd/vYYjqqGB83rnsHffTTG6zlmxZAd0ZSOu6evk=
|
||||
k8s.io/component-helpers v0.27.0 h1:rymQGJc4s30hHeb5VGuPdht8gKIPecj+Bw2FOJSavE4=
|
||||
k8s.io/component-helpers v0.27.0/go.mod h1:vMjVwym/Y0BVyNvg8a4Et2vyPJAh/JhBM0OTRAt0Ceg=
|
||||
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
|
||||
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
|
||||
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
|
||||
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
|
||||
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
|
||||
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
|
||||
k8s.io/kubernetes v1.27.0-rc.0 h1:ao6dcyRr0w4NYhJpNteH1E2SRwkpwKjmhKc8Ce086o8=
|
||||
k8s.io/kubernetes v1.27.0-rc.0/go.mod h1:TTwPjSCKQ+a/NTiFKRGjvOnEaQL8wIG40nsYH8Er4bA=
|
||||
k8s.io/kubernetes v1.27.0 h1:VCI2Qoksx2cv6mHu9g9KVH30ZHNtWSB/+9BtKLSqduM=
|
||||
k8s.io/kubernetes v1.27.0/go.mod h1:TTwPjSCKQ+a/NTiFKRGjvOnEaQL8wIG40nsYH8Er4bA=
|
||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
|
||||
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||
|
@@ -22,17 +22,19 @@ aliases:
|
||||
- ggriffiths
|
||||
- gnufied
|
||||
- humblec
|
||||
- mauriciopoppe
|
||||
- j-griffith
|
||||
- Jiawei0227
|
||||
- jingxu97
|
||||
- jsafrane
|
||||
- pohly
|
||||
- RaunakShah
|
||||
- sunnylovestiramisu
|
||||
- xing-yang
|
||||
|
||||
# This documents who previously contributed to Kubernetes-CSI
|
||||
# as approver.
|
||||
emeritus_approvers:
|
||||
- Jiawei0227
|
||||
- lpabon
|
||||
- sbezverk
|
||||
- vladimirvivien
|
||||
|
@@ -92,6 +92,8 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
||||
1. Check that all [canary CI
|
||||
jobs](https://k8s-testgrid.appspot.com/sig-storage-csi-ci) are passing,
|
||||
and that test coverage is adequate for the changes that are going into the release.
|
||||
1. Check that the post-\<sidecar\>-push-images builds are succeeding.
|
||||
[Example](https://k8s-testgrid.appspot.com/sig-storage-image-build#post-external-snapshotter-push-images)
|
||||
1. Make sure that no new PRs have merged in the meantime, and no PRs are in
|
||||
flight and soon to be merged.
|
||||
1. Create a new release following a previous release as a template. Be sure to select the correct
|
||||
@@ -102,7 +104,7 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
|
||||
1. Check [image build status](https://k8s-testgrid.appspot.com/sig-storage-image-build).
|
||||
1. Promote images from k8s-staging-sig-storage to k8s.gcr.io/sig-storage. From
|
||||
the [k8s image
|
||||
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage),
|
||||
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage),
|
||||
run `./generate.sh > images.yaml`, and send a PR with the updated images.
|
||||
Once merged, the image promoter will copy the images from staging to prod.
|
||||
1. Update [kubernetes-csi/docs](https://github.com/kubernetes-csi/docs) sidecar
|
||||
|
@@ -24,7 +24,6 @@ package main
|
||||
import (
|
||||
"encoding/xml"
|
||||
"flag"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"regexp"
|
||||
)
|
||||
@@ -56,6 +55,7 @@ type TestCase struct {
|
||||
Name string `xml:"name,attr"`
|
||||
Time string `xml:"time,attr"`
|
||||
SystemOut string `xml:"system-out,omitempty"`
|
||||
SystemErr string `xml:"system-err,omitempty"`
|
||||
Failure string `xml:"failure,omitempty"`
|
||||
Skipped SkipReason `xml:"skipped,omitempty"`
|
||||
}
|
||||
@@ -95,7 +95,7 @@ func main() {
|
||||
}
|
||||
} else {
|
||||
var err error
|
||||
data, err = ioutil.ReadFile(input)
|
||||
data, err = os.ReadFile(input)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@@ -109,7 +109,7 @@ func main() {
|
||||
if err := xml.Unmarshal(data, &junitv2); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
junit = junitv2.TestSuite
|
||||
junit.TestCases = append(junit.TestCases, junitv2.TestSuite.TestCases...)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ func main() {
|
||||
panic(err)
|
||||
}
|
||||
} else {
|
||||
if err := ioutil.WriteFile(*output, data, 0644); err != nil {
|
||||
if err := os.WriteFile(*output, data, 0644); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
@@ -86,7 +86,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -pp
|
||||
# which is disabled with GOFLAGS=-mod=vendor).
|
||||
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
|
||||
|
||||
configvar CSI_PROW_GO_VERSION_BUILD "1.19" "Go version for building the component" # depends on component's source code
|
||||
configvar CSI_PROW_GO_VERSION_BUILD "1.20" "Go version for building the component" # depends on component's source code
|
||||
configvar CSI_PROW_GO_VERSION_E2E "" "override Go version for building the Kubernetes E2E test suite" # normally doesn't need to be set, see install_e2e
|
||||
configvar CSI_PROW_GO_VERSION_SANITY "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building the csi-sanity test suite" # depends on CSI_PROW_SANITY settings below
|
||||
configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building 'kind'" # depends on CSI_PROW_KIND_VERSION below
|
||||
@@ -196,7 +196,7 @@ kindest/node:v1.18.20@sha256:738cdc23ed4be6cc0b7ea277a2ebcc454c8373d7d8fb991a7fc
|
||||
# If the deployment script is called with CSI_PROW_TEST_DRIVER=<file name> as
|
||||
# environment variable, then it must write a suitable test driver configuration
|
||||
# into that file in addition to installing the driver.
|
||||
configvar CSI_PROW_DRIVER_VERSION "v1.8.0" "CSI driver version"
|
||||
configvar CSI_PROW_DRIVER_VERSION "v1.11.0" "CSI driver version"
|
||||
configvar CSI_PROW_DRIVER_REPO https://github.com/kubernetes-csi/csi-driver-host-path "CSI driver repo"
|
||||
configvar CSI_PROW_DEPLOYMENT "" "deployment"
|
||||
configvar CSI_PROW_DEPLOYMENT_SUFFIX "" "additional suffix in kubernetes-x.yy[suffix].yaml files"
|
||||
@@ -245,7 +245,7 @@ configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI dr
|
||||
|
||||
# The version of dep to use for 'make test-vendor'. Ignored if the project doesn't
|
||||
# use dep. Only binary releases of dep are supported (https://github.com/golang/dep/releases).
|
||||
configvar CSI_PROW_DEP_VERSION v0.5.1 "golang dep version to be used for vendor checking"
|
||||
configvar CSI_PROW_DEP_VERSION v0.5.4 "golang dep version to be used for vendor checking"
|
||||
|
||||
# Each job can run one or more of the following tests, identified by
|
||||
# a single word:
|
||||
@@ -469,7 +469,7 @@ install_dep () {
|
||||
if dep version 2>/dev/null | grep -q "version:.*${CSI_PROW_DEP_VERSION}$"; then
|
||||
return
|
||||
fi
|
||||
run curl --fail --location -o "${CSI_PROW_WORK}/bin/dep" "https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64" &&
|
||||
run curl --fail --location -o "${CSI_PROW_WORK}/bin/dep" "https://github.com/golang/dep/releases/download/${CSI_PROW_DEP_VERSION}/dep-linux-amd64" &&
|
||||
chmod u+x "${CSI_PROW_WORK}/bin/dep"
|
||||
}
|
||||
|
||||
@@ -1008,7 +1008,10 @@ run_e2e () (
|
||||
# the full Kubernetes E2E testsuite while only running a few tests.
|
||||
move_junit () {
|
||||
if ls "${ARTIFACTS}"/junit_[0-9]*.xml 2>/dev/null >/dev/null; then
|
||||
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
|
||||
mkdir -p "${ARTIFACTS}/junit/${name}" &&
|
||||
mkdir -p "${ARTIFACTS}/junit/steps" &&
|
||||
run_filter_junit -t="External.Storage|CSI.mock.volume" -o "${ARTIFACTS}/junit/steps/junit_${name}.xml" "${ARTIFACTS}"/junit_[0-9]*.xml &&
|
||||
mv "${ARTIFACTS}"/junit_[0-9]*.xml "${ARTIFACTS}/junit/${name}/"
|
||||
fi
|
||||
}
|
||||
trap move_junit EXIT
|
||||
@@ -1085,13 +1088,14 @@ kubectl exec "$pod" -c "${CSI_PROW_SANITY_CONTAINER}" -- /bin/sh -c "\${CHECK_PA
|
||||
EOF
|
||||
|
||||
chmod u+x "${CSI_PROW_WORK}"/*dir_in_pod.sh
|
||||
mkdir -p "${ARTIFACTS}/junit/steps"
|
||||
|
||||
# This cannot run in parallel, because -csi.junitfile output
|
||||
# from different Ginkgo nodes would go to the same file. Also the
|
||||
# staging and target directories are the same.
|
||||
run_with_loggers "${CSI_PROW_WORK}/csi-sanity" \
|
||||
-ginkgo.v \
|
||||
-csi.junitfile "${ARTIFACTS}/junit_sanity.xml" \
|
||||
-csi.junitfile "${ARTIFACTS}/junit/steps/junit_sanity.xml" \
|
||||
-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}")" \
|
||||
-csi.stagingdir "/tmp/staging" \
|
||||
-csi.mountdir "/tmp/mount" \
|
||||
@@ -1121,7 +1125,8 @@ make_test_to_junit () {
|
||||
# Plain make-test.xml was not delivered as text/xml by the web
|
||||
# server and ignored by spyglass. It seems that the name has to
|
||||
# match junit*.xml.
|
||||
out="${ARTIFACTS}/junit_make_test.xml"
|
||||
out="${ARTIFACTS}/junit/steps/junit_make_test.xml"
|
||||
mkdir -p "$(dirname "$out")"
|
||||
testname=
|
||||
echo "<testsuite>" >>"$out"
|
||||
|
||||
@@ -1385,8 +1390,8 @@ main () {
|
||||
fi
|
||||
|
||||
# Merge all junit files into one. This gets rid of duplicated "skipped" tests.
|
||||
if ls "${ARTIFACTS}"/junit_*.xml 2>/dev/null >&2; then
|
||||
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}"
|
||||
if ls "${ARTIFACTS}"/junit/steps/junit_*.xml 2>/dev/null >&2; then
|
||||
run_filter_junit -o "${ARTIFACTS}/junit_final.xml" "${ARTIFACTS}"/junit/steps/junit_*.xml
|
||||
fi
|
||||
|
||||
return "$ret"
|
||||
|
66
vendor/modules.txt
vendored
66
vendor/modules.txt
vendored
@@ -304,7 +304,7 @@ gopkg.in/yaml.v2
|
||||
# gopkg.in/yaml.v3 v3.0.1
|
||||
## explicit
|
||||
gopkg.in/yaml.v3
|
||||
# k8s.io/api v0.27.0-rc.0 => k8s.io/api v0.27.0-rc.0
|
||||
# k8s.io/api v0.27.0 => k8s.io/api v0.27.0
|
||||
## explicit; go 1.20
|
||||
k8s.io/api/admission/v1
|
||||
k8s.io/api/admission/v1beta1
|
||||
@@ -360,7 +360,7 @@ k8s.io/api/scheduling/v1beta1
|
||||
k8s.io/api/storage/v1
|
||||
k8s.io/api/storage/v1alpha1
|
||||
k8s.io/api/storage/v1beta1
|
||||
# k8s.io/apimachinery v0.27.0-rc.0 => k8s.io/apimachinery v0.27.0-rc.0
|
||||
# k8s.io/apimachinery v0.27.0 => k8s.io/apimachinery v0.27.0
|
||||
## explicit; go 1.20
|
||||
k8s.io/apimachinery/pkg/api/apitesting/fuzzer
|
||||
k8s.io/apimachinery/pkg/api/equality
|
||||
@@ -409,7 +409,7 @@ k8s.io/apimachinery/pkg/version
|
||||
k8s.io/apimachinery/pkg/watch
|
||||
k8s.io/apimachinery/third_party/forked/golang/json
|
||||
k8s.io/apimachinery/third_party/forked/golang/reflect
|
||||
# k8s.io/client-go v0.27.0-rc.0 => k8s.io/client-go v0.27.0-rc.0
|
||||
# k8s.io/client-go v0.27.0 => k8s.io/client-go v0.27.0
|
||||
## explicit; go 1.20
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
|
||||
@@ -711,12 +711,12 @@ k8s.io/client-go/util/flowcontrol
|
||||
k8s.io/client-go/util/homedir
|
||||
k8s.io/client-go/util/keyutil
|
||||
k8s.io/client-go/util/workqueue
|
||||
# k8s.io/component-base v0.27.0-rc.0 => k8s.io/component-base v0.27.0-rc.0
|
||||
# k8s.io/component-base v0.27.0 => k8s.io/component-base v0.27.0
|
||||
## explicit; go 1.20
|
||||
k8s.io/component-base/metrics
|
||||
k8s.io/component-base/metrics/prometheusextension
|
||||
k8s.io/component-base/version
|
||||
# k8s.io/component-helpers v0.27.0-rc.0 => k8s.io/component-helpers v0.27.0-rc.0
|
||||
# k8s.io/component-helpers v0.27.0 => k8s.io/component-helpers v0.27.0
|
||||
## explicit; go 1.20
|
||||
k8s.io/component-helpers/scheduling/corev1
|
||||
k8s.io/component-helpers/scheduling/corev1/nodeaffinity
|
||||
@@ -745,7 +745,7 @@ k8s.io/kube-openapi/pkg/schemamutation
|
||||
k8s.io/kube-openapi/pkg/spec3
|
||||
k8s.io/kube-openapi/pkg/util/proto
|
||||
k8s.io/kube-openapi/pkg/validation/spec
|
||||
# k8s.io/kubernetes v1.27.0-rc.0
|
||||
# k8s.io/kubernetes v1.27.0
|
||||
## explicit; go 1.20
|
||||
k8s.io/kubernetes/pkg/apis/admission/fuzzer
|
||||
# k8s.io/utils v0.0.0-20230209194617-a36077c30491
|
||||
@@ -774,30 +774,30 @@ sigs.k8s.io/structured-merge-diff/v4/value
|
||||
## explicit; go 1.12
|
||||
sigs.k8s.io/yaml
|
||||
# github.com/kubernetes-csi/external-snapshotter/client/v6 => ./client
|
||||
# k8s.io/api => k8s.io/api v0.27.0-rc.0
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0-rc.0
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.27.0-rc.0
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.27.0-rc.0
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0-rc.0
|
||||
# k8s.io/client-go => k8s.io/client-go v0.27.0-rc.0
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0-rc.0
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0-rc.0
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.27.0-rc.0
|
||||
# k8s.io/component-base => k8s.io/component-base v0.27.0-rc.0
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.27.0-rc.0
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.27.0-rc.0
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.27.0-rc.0
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0-rc.0
|
||||
# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.0-rc.0
|
||||
# k8s.io/kms => k8s.io/kms v0.27.0-rc.0
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.0-rc.0
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.0-rc.0
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.0-rc.0
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0-rc.0
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.27.0-rc.0
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.27.0-rc.0
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0-rc.0
|
||||
# k8s.io/metrics => k8s.io/metrics v0.27.0-rc.0
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.27.0-rc.0
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0-rc.0
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0-rc.0
|
||||
# k8s.io/api => k8s.io/api v0.27.0
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.27.0
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.27.0
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0
|
||||
# k8s.io/client-go => k8s.io/client-go v0.27.0
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.27.0
|
||||
# k8s.io/component-base => k8s.io/component-base v0.27.0
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.27.0
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.27.0
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.27.0
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0
|
||||
# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.0
|
||||
# k8s.io/kms => k8s.io/kms v0.27.0
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.0
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.0
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.0
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.27.0
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.27.0
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0
|
||||
# k8s.io/metrics => k8s.io/metrics v0.27.0
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.27.0
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0
|
||||
|
Reference in New Issue
Block a user