Merge pull request #94376 from mkumatag/patch-2
Skip TestLoopbackHostPortIPv6 run on non-IPv6 env Kubernetes-commit: 0d2205f515d8655ab6d0cdabc54f2718eb0fc518
This commit is contained in:
commit
92dfcce91e
|
@ -668,7 +668,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "9a1561067c54"
|
||||
"Rev": "73d7eb3bb026"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
|
|
4
go.mod
4
go.mod
|
@ -41,7 +41,7 @@ require (
|
|||
gopkg.in/natefinch/lumberjack.v2 v2.0.0
|
||||
gopkg.in/square/go-jose.v2 v2.2.2
|
||||
gopkg.in/yaml.v2 v2.2.8
|
||||
k8s.io/api v0.0.0-20200831211624-9a1561067c54
|
||||
k8s.io/api v0.0.0-20200902051604-73d7eb3bb026
|
||||
k8s.io/apimachinery v0.0.0-20200830011411-94222d04a590
|
||||
k8s.io/client-go v0.0.0-20200902051830-aeb5f1a7757b
|
||||
k8s.io/component-base v0.0.0-20200828052305-e83f66bbf913
|
||||
|
@ -54,7 +54,7 @@ require (
|
|||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20200831211624-9a1561067c54
|
||||
k8s.io/api => k8s.io/api v0.0.0-20200902051604-73d7eb3bb026
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200830011411-94222d04a590
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20200902051830-aeb5f1a7757b
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20200828052305-e83f66bbf913
|
||||
|
|
2
go.sum
2
go.sum
|
@ -507,7 +507,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
k8s.io/api v0.0.0-20200831211624-9a1561067c54/go.mod h1:qMn0Ckwm7+s/YbS3iDBlHErlW/SeOXttpV83LV5iO5M=
|
||||
k8s.io/api v0.0.0-20200902051604-73d7eb3bb026/go.mod h1:qMn0Ckwm7+s/YbS3iDBlHErlW/SeOXttpV83LV5iO5M=
|
||||
k8s.io/apimachinery v0.0.0-20200830011411-94222d04a590/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
|
||||
k8s.io/client-go v0.0.0-20200902051830-aeb5f1a7757b/go.mod h1:nlzxA8HNRwxNEbk4tOITg7LLVhjbthrQ69vw+2jhfYc=
|
||||
k8s.io/component-base v0.0.0-20200828052305-e83f66bbf913/go.mod h1:uWiI7f7Tvt3aVPEoe7YmG+5By+6mhbkGnX16+GxpDYg=
|
||||
|
|
|
@ -60,7 +60,7 @@ func TestLoopbackHostPortIPv6(t *testing.T) {
|
|||
t.Fatalf("fail to enumerate network interface, %s", err)
|
||||
}
|
||||
if !ipv6 {
|
||||
t.Fatalf("no ipv6 loopback interface")
|
||||
t.Skip("no ipv6 loopback interface")
|
||||
}
|
||||
|
||||
host, port, err := LoopbackHostPort("[ff06:0:0:0:0:0:0:c3]:443")
|
||||
|
|
Loading…
Reference in New Issue