mirror of
https://github.com/weaveworks/scope.git
synced 2026-07-28 01:31:17 +00:00
fd01143725
This will
Add:
- golang.org/x/time
upgrade:
- k8s.io/client-go v8.0.0
- k8s.io/api version to kubernetes-1.11.0
- k8s.io/apimachinery version to kubernetes-1.11.0
- github.com/json-iterator/go version to latest because `https://github.com/kubernetes/kubernetes/issues/64612`
delete:
- vendor/github.com/juju/ratelimit because k8s-client-go is shifted to golang.org/x/time
Please refer: acc52496ce
```
gvt delete k8s.io/client-go
gvt delete k8s.io/api
gvt delete k8s.io/apimachinery
gvt delete github.com/json-iterator/go
gvt delete github.com/juju/ratelimit
gvt fetch --no-recurse -tag v8.0.0 k8s.io/client-go
gvt fetch --no-recurse -tag kubernetes-1.11.0 k8s.io/api
gvt fetch --no-recurse -tag kubernetes-1.11.0 k8s.io/apimachinery
gvt fetch github.com/json-iterator/go
gvt fetch golang.org/x/time
```
fixes: #3284
Signed-off-by: Satyam Zode <satyamzode@gmail.com>
57 lines
1.5 KiB
Go
57 lines
1.5 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package net
|
|
|
|
import (
|
|
"net"
|
|
"net/url"
|
|
"os"
|
|
"reflect"
|
|
"syscall"
|
|
)
|
|
|
|
// IPNetEqual checks if the two input IPNets are representing the same subnet.
|
|
// For example,
|
|
// 10.0.0.1/24 and 10.0.0.0/24 are the same subnet.
|
|
// 10.0.0.1/24 and 10.0.0.0/25 are not the same subnet.
|
|
func IPNetEqual(ipnet1, ipnet2 *net.IPNet) bool {
|
|
if ipnet1 == nil || ipnet2 == nil {
|
|
return false
|
|
}
|
|
if reflect.DeepEqual(ipnet1.Mask, ipnet2.Mask) && ipnet1.Contains(ipnet2.IP) && ipnet2.Contains(ipnet1.IP) {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// Returns if the given err is "connection reset by peer" error.
|
|
func IsConnectionReset(err error) bool {
|
|
if urlErr, ok := err.(*url.Error); ok {
|
|
err = urlErr.Err
|
|
}
|
|
if opErr, ok := err.(*net.OpError); ok {
|
|
err = opErr.Err
|
|
}
|
|
if osErr, ok := err.(*os.SyscallError); ok {
|
|
err = osErr.Err
|
|
}
|
|
if errno, ok := err.(syscall.Errno); ok && errno == syscall.ECONNRESET {
|
|
return true
|
|
}
|
|
return false
|
|
}
|