kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109102 from liggitt/darwin-tls 

Tolerate additional error messages in TLS unit tests

Kubernetes-commit: 6358d36fbfb1a899de227bd053279ad258bddab3
This commit is contained in:
Kubernetes Publisher 2022-03-29 20:36:50 -07:00
parent ee1ac0ffde 5f8feb467c
commit 320581ace3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -43,7 +43,7 @@ require (
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-20220330051021-b754a94214be k8s.io/api v0.0.0-20220330051021-b754a94214be
k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12 k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092 k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092
k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a
k8s.io/klog/v2 v2.60.1 k8s.io/klog/v2 v2.60.1
@ -57,7 +57,7 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220330051021-b754a94214be k8s.io/api => k8s.io/api v0.0.0-20220330051021-b754a94214be
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
k8s.io/client-go => k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092 k8s.io/client-go => k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092
k8s.io/component-base => k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a k8s.io/component-base => k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a
) )

4
go.sum
View File

@ -956,8 +956,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/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.0.0-20220330051021-b754a94214be h1:UnXBdsSVy3e2Y6cyf9rVmzn0wPXyoUuGIZAM43vdTj0= k8s.io/api v0.0.0-20220330051021-b754a94214be h1:UnXBdsSVy3e2Y6cyf9rVmzn0wPXyoUuGIZAM43vdTj0=
k8s.io/api v0.0.0-20220330051021-b754a94214be/go.mod h1:gL+2VXubbVTH6gK18uLau2gxoDmu43bdiQmz5TTa3zw= k8s.io/api v0.0.0-20220330051021-b754a94214be/go.mod h1:gL+2VXubbVTH6gK18uLau2gxoDmu43bdiQmz5TTa3zw=
k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12 h1:+Cp1h0ojFtOluw7Bgiju2A/LqoWzeYyaB+sY/YSflwE= k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444 h1:whQmS3GtF822OUer+LPJnMFKn6kPfuJOCM/3xUuATIY=
k8s.io/apimachinery v0.0.0-20220330050810-00f071187c12/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092 h1:juuWgiTcvrIkUVtF+C5CYsVA0YK7eNA6M/uD1J4WxNU= k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092 h1:juuWgiTcvrIkUVtF+C5CYsVA0YK7eNA6M/uD1J4WxNU=
k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092/go.mod h1:891OlZJw6BK4fpxlZNVtaoFv0uIX9BfbxEsmMJBv1xM= k8s.io/client-go v0.0.0-20220330051330-b1e85f6f0092/go.mod h1:891OlZJw6BK4fpxlZNVtaoFv0uIX9BfbxEsmMJBv1xM=
k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a h1:5GgsJwT9dZE4ta+/a+DDXa2FB0f7ZkmwqJbFE6CHZHo= k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a h1:5GgsJwT9dZE4ta+/a+DDXa2FB0f7ZkmwqJbFE6CHZHo=

2
pkg/util/webhook/webhook_test.go
View File

@ -50,7 +50,7 @@ const (
errBadCertificate = "Get .*: remote error: tls: bad certificate" errBadCertificate = "Get .*: remote error: tls: bad certificate"
errNoConfiguration = "invalid configuration: no configuration has been provided" errNoConfiguration = "invalid configuration: no configuration has been provided"
errMissingCertPath = "invalid configuration: unable to read %s %s for %s due to open %s: .*" errMissingCertPath = "invalid configuration: unable to read %s %s for %s due to open %s: .*"
errSignedByUnknownCA = "Get .*: x509: certificate signed by unknown authority" errSignedByUnknownCA = "Get .*: x509: .*(unknown authority|not standards compliant|not trusted)"
) )
var ( var (