Merge pull request #101707 from enj/enj/i/bad_cadata

client-go transport: assert that final CA data is valid

Kubernetes-commit: 9126048c9c47cc51f15f977da51c6023229a02b5
This commit is contained in:
Kubernetes Publisher 2021-05-04 07:29:11 -07:00
parent 5289a15a1a
commit c55f8b7cef
3 changed files with 15 additions and 15 deletions

6
Godeps/Godeps.json generated
View File

@ -920,15 +920,15 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "73cb810742ad" "Rev": "13f29098a509"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "b3737e4729cb" "Rev": "fda713515979"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "341f59a1cb7c" "Rev": "2ed8b3081056"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",

12
go.mod
View File

@ -38,9 +38,9 @@ require (
google.golang.org/grpc v1.27.1 google.golang.org/grpc v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20210518101604-73cb810742ad k8s.io/api v0.0.0-20210518101607-13f29098a509
k8s.io/apimachinery v0.0.0-20210518100453-05188bab0ab7 k8s.io/apimachinery v0.0.0-20210518100456-fda713515979
k8s.io/client-go v0.0.0-20210518102918-341f59a1cb7c k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056
k8s.io/component-base v0.0.0-20210518111232-44faecbf614e k8s.io/component-base v0.0.0-20210518111232-44faecbf614e
k8s.io/klog/v2 v2.8.0 k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
@ -51,8 +51,8 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20210518101604-73cb810742ad k8s.io/api => k8s.io/api v0.0.0-20210518101607-13f29098a509
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210430172414-b3737e4729cb k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100456-fda713515979
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102918-341f59a1cb7c k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056
k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111232-44faecbf614e k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111232-44faecbf614e
) )

12
go.sum
View File

@ -674,12 +674,12 @@ 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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210518101604-73cb810742ad h1:Y3Y8dvutfX0ctUvW8lOIRWtGQ78do2iq0kyzOgP7Kzs= k8s.io/api v0.0.0-20210518101607-13f29098a509 h1:+1GipftN626FJVaUP8O0o0pgeqGunyS22Ng4hZYulvI=
k8s.io/api v0.0.0-20210518101604-73cb810742ad/go.mod h1:oMHvpJd6cjQV4EGOZctXILY3h91ViVRHybL+6tnKvPA= k8s.io/api v0.0.0-20210518101607-13f29098a509/go.mod h1:IgKLK42qxUHnMxdcdbEBFOo+TfTANemQTLg3gcGe8/M=
k8s.io/apimachinery v0.0.0-20210430172414-b3737e4729cb h1:IqwN+YxW5A4E0rfD2q2cITUUso4A2g29+gbwDhG0GWI= k8s.io/apimachinery v0.0.0-20210518100456-fda713515979 h1:qjGp8QxGJZSGSMQw31AFuI2za6IEfDmdJ5/cY+Eeas8=
k8s.io/apimachinery v0.0.0-20210430172414-b3737e4729cb/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs= k8s.io/apimachinery v0.0.0-20210518100456-fda713515979/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
k8s.io/client-go v0.0.0-20210518102918-341f59a1cb7c h1:9cr2yWqirbbu84bCliRMOxn3qzpAhNRduyInJ6jX8aE= k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056 h1:t4nxl6RpDRcvk1H0shNODINaiDEcBvGozB+ufxikbiA=
k8s.io/client-go v0.0.0-20210518102918-341f59a1cb7c/go.mod h1:QQ7muTezyh3tGWs4tgJpfIO0VAsxxSFG7tz5ks3JTos= k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056/go.mod h1:qBjkJPJp2FjoQFwy9eLFYI4JdHeFm0KH+j9/XQhCMi8=
k8s.io/component-base v0.0.0-20210518111232-44faecbf614e h1:+LvsEqL+o2/s3SNrTdZm22miglZOm3TPof8oO5pa2F8= k8s.io/component-base v0.0.0-20210518111232-44faecbf614e h1:+LvsEqL+o2/s3SNrTdZm22miglZOm3TPof8oO5pa2F8=
k8s.io/component-base v0.0.0-20210518111232-44faecbf614e/go.mod h1:VYU6k+gXEg7lXm+XCubCKvSlHHI9l+JHRJ0Hw4nrjug= k8s.io/component-base v0.0.0-20210518111232-44faecbf614e/go.mod h1:VYU6k+gXEg7lXm+XCubCKvSlHHI9l+JHRJ0Hw4nrjug=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=