mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-14 14:23:37 +00:00
Merge branch 'master' of https://github.com/kubernetes/kubernetes into ipv6
This commit is contained in:
commit
a2256c060e
@ -93,6 +93,7 @@ go_library(
|
|||||||
"//pkg/util/sysctl:go_default_library",
|
"//pkg/util/sysctl:go_default_library",
|
||||||
"//pkg/util/version:go_default_library",
|
"//pkg/util/version:go_default_library",
|
||||||
"//vendor/github.com/golang/glog:go_default_library",
|
"//vendor/github.com/golang/glog:go_default_library",
|
||||||
|
"//vendor/golang.org/x/sys/unix:go_default_library",
|
||||||
"//vendor/k8s.io/api/core/v1:go_default_library",
|
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
|
||||||
@ -102,7 +103,6 @@ go_library(
|
|||||||
] + select({
|
] + select({
|
||||||
"@io_bazel_rules_go//go/platform:linux": [
|
"@io_bazel_rules_go//go/platform:linux": [
|
||||||
"//vendor/github.com/vishvananda/netlink:go_default_library",
|
"//vendor/github.com/vishvananda/netlink:go_default_library",
|
||||||
"//vendor/golang.org/x/sys/unix:go_default_library",
|
|
||||||
],
|
],
|
||||||
"//conditions:default": [],
|
"//conditions:default": [],
|
||||||
}),
|
}),
|
||||||
|
@ -51,6 +51,8 @@ import (
|
|||||||
utilipvs "k8s.io/kubernetes/pkg/util/ipvs"
|
utilipvs "k8s.io/kubernetes/pkg/util/ipvs"
|
||||||
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
|
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
|
||||||
utilexec "k8s.io/utils/exec"
|
utilexec "k8s.io/utils/exec"
|
||||||
|
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -1702,8 +1704,9 @@ func (proxier *Proxier) cleanLegacyService(atciveServices map[string]bool, curre
|
|||||||
|
|
||||||
for _, addr := range unbindIPAddr.UnsortedList() {
|
for _, addr := range unbindIPAddr.UnsortedList() {
|
||||||
err := proxier.netlinkHandle.UnbindAddress(addr, DefaultDummyDevice)
|
err := proxier.netlinkHandle.UnbindAddress(addr, DefaultDummyDevice)
|
||||||
if err != nil {
|
// Ignore no such address error when try to unbind address
|
||||||
glog.Errorf("Failed to unbind service from dummy interface, error: %v", err)
|
if err != nil && err != unix.ENXIO {
|
||||||
|
glog.Errorf("Failed to unbind service addr %s from dummy interface %s: %v", addr, DefaultDummyDevice, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
8
pkg/util/ipset/OWNERS
Normal file
8
pkg/util/ipset/OWNERS
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
reviewers:
|
||||||
|
- thockin
|
||||||
|
- brendandburns
|
||||||
|
- m1093782566
|
||||||
|
approvers:
|
||||||
|
- thockin
|
||||||
|
- brendandburns
|
||||||
|
- m1093782566
|
Loading…
Reference in New Issue
Block a user