github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101303 from wangyx1992/capatial-log-proxy

Browse Source 
cleanup: fix errors in wrapped format and log capitalization in proxy
This commit is contained in:
Kubernetes Prow Robot 2021-09-03 10:01:50 -07:00 committed by GitHub
commit d3621ae008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/proxy/endpointslicecache.go
View File

@ -376,9 +376,9 @@ func endpointSliceCacheKeys(endpointSlice *discovery.EndpointSlice) (types.Names
var err error var err error
serviceName, ok := endpointSlice.Labels[discovery.LabelServiceName] serviceName, ok := endpointSlice.Labels[discovery.LabelServiceName]
if !ok || serviceName == "" { if !ok || serviceName == "" {
err = fmt.Errorf("No %s label set on endpoint slice: %s", discovery.LabelServiceName, endpointSlice.Name) err = fmt.Errorf("no %s label set on endpoint slice: %s", discovery.LabelServiceName, endpointSlice.Name)
} else if endpointSlice.Namespace == "" || endpointSlice.Name == "" { } else if endpointSlice.Namespace == "" || endpointSlice.Name == "" {
err = fmt.Errorf("Expected EndpointSlice name and namespace to be set: %v", endpointSlice) err = fmt.Errorf("expected EndpointSlice name and namespace to be set: %v", endpointSlice)
} }
return types.NamespacedName{Namespace: endpointSlice.Namespace, Name: serviceName}, endpointSlice.Name, err return types.NamespacedName{Namespace: endpointSlice.Namespace, Name: serviceName}, endpointSlice.Name, err
} }

4
pkg/proxy/ipvs/graceful_termination.go
View File

@ -173,12 +173,12 @@ func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, e
klog.V(5).Infof("Deleting rs: %s", rsToDelete.String()) klog.V(5).Infof("Deleting rs: %s", rsToDelete.String())
err := m.ipvs.DeleteRealServer(rsToDelete.VirtualServer, rs) err := m.ipvs.DeleteRealServer(rsToDelete.VirtualServer, rs)
if err != nil { if err != nil {
return false, fmt.Errorf("Delete destination %q err: %v", rs.String(), err) return false, fmt.Errorf("delete destination %q err: %w", rs.String(), err)
} }
return true, nil return true, nil
} }
} }
return true, fmt.Errorf("Failed to delete rs %q, can't find the real server", rsToDelete.String()) return true, fmt.Errorf("failed to delete rs %q, can't find the real server", rsToDelete.String())
} }
func (m *GracefulTerminationManager) tryDeleteRs() { func (m *GracefulTerminationManager) tryDeleteRs() {

4
pkg/proxy/ipvs/proxier.go
View File

@ -624,7 +624,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
kernelConfigFile := fmt.Sprintf("/boot/config-%s", kernelVersionStr) kernelConfigFile := fmt.Sprintf("/boot/config-%s", kernelVersionStr)
kConfig, err := ioutil.ReadFile(kernelConfigFile) kConfig, err := ioutil.ReadFile(kernelConfigFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to read Kernel Config file %s with error %v", kernelConfigFile, err) return nil, fmt.Errorf("failed to read Kernel Config file %s with error %w", kernelConfigFile, err)
} }
for _, module := range ipvsModules { for _, module := range ipvsModules {
if match, _ := regexp.Match("CONFIG_"+strings.ToUpper(module)+"=y", kConfig); match { if match, _ := regexp.Match("CONFIG_"+strings.ToUpper(module)+"=y", kConfig); match {
@ -634,7 +634,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) {
return bmods, nil return bmods, nil
} }
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to read file /proc/modules with error %v", err) return nil, fmt.Errorf("failed to read file /proc/modules with error %w", err)
} }
defer modulesFile.Close() defer modulesFile.Close()

20
pkg/proxy/ipvs/testing/fake.go
View File

@ -40,10 +40,10 @@ func NewFakeNetlinkHandle() *FakeNetlinkHandle {
// EnsureAddressBind is a mock implementation // EnsureAddressBind is a mock implementation
func (h *FakeNetlinkHandle) EnsureAddressBind(address, devName string) (exist bool, err error) { func (h *FakeNetlinkHandle) EnsureAddressBind(address, devName string) (exist bool, err error) {
if len(devName) == 0 { if len(devName) == 0 {
return false, fmt.Errorf("Device name can't be empty") return false, fmt.Errorf("device name can't be empty")
} }
if _, ok := h.localAddresses[devName]; !ok { if _, ok := h.localAddresses[devName]; !ok {
return false, fmt.Errorf("Error bind address: %s to a non-exist interface: %s", address, devName) return false, fmt.Errorf("error bind address: %s to a non-exist interface: %s", address, devName)
} }
for _, addr := range h.localAddresses[devName] { for _, addr := range h.localAddresses[devName] {
if addr == address { if addr == address {
@ -58,10 +58,10 @@ func (h *FakeNetlinkHandle) EnsureAddressBind(address, devName string) (exist bo
// UnbindAddress is a mock implementation // UnbindAddress is a mock implementation
func (h *FakeNetlinkHandle) UnbindAddress(address, devName string) error { func (h *FakeNetlinkHandle) UnbindAddress(address, devName string) error {
if len(devName) == 0 { if len(devName) == 0 {
return fmt.Errorf("Device name can't be empty") return fmt.Errorf("device name can't be empty")
} }
if _, ok := h.localAddresses[devName]; !ok { if _, ok := h.localAddresses[devName]; !ok {
return fmt.Errorf("Error unbind address: %s from a non-exist interface: %s", address, devName) return fmt.Errorf("error unbind address: %s from a non-exist interface: %s", address, devName)
} }
for i, addr := range h.localAddresses[devName] { for i, addr := range h.localAddresses[devName] {
if addr == address { if addr == address {
@ -71,13 +71,13 @@ func (h *FakeNetlinkHandle) UnbindAddress(address, devName string) error {
} }
} }
// return error message if address is not found in slice h.localAddresses[devName] // return error message if address is not found in slice h.localAddresses[devName]
return fmt.Errorf("Address: %s is not found in interface: %s", address, devName) return fmt.Errorf("address: %s is not found in interface: %s", address, devName)
} }
// EnsureDummyDevice is a mock implementation // EnsureDummyDevice is a mock implementation
func (h *FakeNetlinkHandle) EnsureDummyDevice(devName string) (bool, error) { func (h *FakeNetlinkHandle) EnsureDummyDevice(devName string) (bool, error) {
if len(devName) == 0 { if len(devName) == 0 {
return false, fmt.Errorf("Device name can't be empty") return false, fmt.Errorf("device name can't be empty")
} }
if _, ok := h.localAddresses[devName]; !ok { if _, ok := h.localAddresses[devName]; !ok {
// create dummy interface if devName is not found in localAddress map // create dummy interface if devName is not found in localAddress map
@ -91,10 +91,10 @@ func (h *FakeNetlinkHandle) EnsureDummyDevice(devName string) (bool, error) {
// DeleteDummyDevice is a mock implementation // DeleteDummyDevice is a mock implementation
func (h *FakeNetlinkHandle) DeleteDummyDevice(devName string) error { func (h *FakeNetlinkHandle) DeleteDummyDevice(devName string) error {
if len(devName) == 0 { if len(devName) == 0 {
return fmt.Errorf("Device name can't be empty") return fmt.Errorf("device name can't be empty")
} }
if _, ok := h.localAddresses[devName]; !ok { if _, ok := h.localAddresses[devName]; !ok {
return fmt.Errorf("Error deleting a non-exist interface: %s", devName) return fmt.Errorf("error deleting a non-exist interface: %s", devName)
} }
delete(h.localAddresses, devName) delete(h.localAddresses, devName)
return nil return nil
@ -103,10 +103,10 @@ func (h *FakeNetlinkHandle) DeleteDummyDevice(devName string) error {
// ListBindAddress is a mock implementation // ListBindAddress is a mock implementation
func (h *FakeNetlinkHandle) ListBindAddress(devName string) ([]string, error) { func (h *FakeNetlinkHandle) ListBindAddress(devName string) ([]string, error) {
if len(devName) == 0 { if len(devName) == 0 {
return nil, fmt.Errorf("Device name can't be empty") return nil, fmt.Errorf("device name can't be empty")
} }
if _, ok := h.localAddresses[devName]; !ok { if _, ok := h.localAddresses[devName]; !ok {
return nil, fmt.Errorf("Error list addresses from a non-exist interface: %s", devName) return nil, fmt.Errorf("error list addresses from a non-exist interface: %s", devName)
} }
return h.localAddresses[devName], nil return h.localAddresses[devName], nil
} }

4
pkg/proxy/userspace/proxier.go
View File

@ -487,10 +487,10 @@ func (proxier *Proxier) addServiceOnPortInternal(service proxy.ServicePortName,
func (proxier *Proxier) cleanupPortalAndProxy(serviceName proxy.ServicePortName, info *ServiceInfo) error { func (proxier *Proxier) cleanupPortalAndProxy(serviceName proxy.ServicePortName, info *ServiceInfo) error {
if err := proxier.closePortal(serviceName, info); err != nil { if err := proxier.closePortal(serviceName, info); err != nil {
return fmt.Errorf("Failed to close portal for %q: %v", serviceName, err) return fmt.Errorf("failed to close portal for %q: %w", serviceName, err)
} }
if err := proxier.stopProxy(serviceName, info); err != nil { if err := proxier.stopProxy(serviceName, info); err != nil {
return fmt.Errorf("Failed to stop service %q: %v", serviceName, err) return fmt.Errorf("failed to stop service %q: %w", serviceName, err)
} }
return nil return nil
} }

2
pkg/proxy/util/utils.go
View File

@ -50,7 +50,7 @@ var (
ErrAddressNotAllowed = errors.New("address not allowed") ErrAddressNotAllowed = errors.New("address not allowed")
// ErrNoAddresses indicates there are no addresses for the hostname // ErrNoAddresses indicates there are no addresses for the hostname
ErrNoAddresses = errors.New("No addresses for hostname") ErrNoAddresses = errors.New("no addresses for hostname")
) )
// isValidEndpoint checks that the given host / port pair are valid endpoint // isValidEndpoint checks that the given host / port pair are valid endpoint

4
pkg/proxy/winkernel/hnsV1.go
View File

@ -83,7 +83,7 @@ func (hns hnsV1) getEndpointByIpAddress(ip string, networkName string) (*endpoin
endpoints, err := hcsshim.HNSListEndpointRequest() endpoints, err := hcsshim.HNSListEndpointRequest()
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to list endpoints: %v", err) return nil, fmt.Errorf("failed to list endpoints: %w", err)
} }
for _, endpoint := range endpoints { for _, endpoint := range endpoints {
equal := false equal := false
@ -139,7 +139,7 @@ func (hns hnsV1) createEndpoint(ep *endpointsInfo, networkName string) (*endpoin
} else { } else {
createdEndpoint, err = hnsNetwork.CreateEndpoint(hnsEndpoint) createdEndpoint, err = hnsNetwork.CreateEndpoint(hnsEndpoint)
if err != nil { if err != nil {
return nil, fmt.Errorf("Local endpoint creation failed: %v", err) return nil, fmt.Errorf("local endpoint creation failed: %w", err)
} }
} }
return &endpointsInfo{ return &endpointsInfo{

4
pkg/proxy/winkernel/hnsV2.go
View File

@ -49,7 +49,7 @@ func (hns hnsV2) getNetworkByName(name string) (*hnsNetworkInfo, error) {
policySettings := hcn.RemoteSubnetRoutePolicySetting{} policySettings := hcn.RemoteSubnetRoutePolicySetting{}
err = json.Unmarshal(policy.Settings, &policySettings) err = json.Unmarshal(policy.Settings, &policySettings)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to unmarshal Remote Subnet policy settings") return nil, fmt.Errorf("failed to unmarshal Remote Subnet policy settings")
} }
rs := &remoteSubnetInfo{ rs := &remoteSubnetInfo{
destinationPrefix: policySettings.DestinationPrefix, destinationPrefix: policySettings.DestinationPrefix,
@ -90,7 +90,7 @@ func (hns hnsV2) getEndpointByIpAddress(ip string, networkName string) (*endpoin
endpoints, err := hcn.ListEndpoints() endpoints, err := hcn.ListEndpoints()
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to list endpoints: %v", err) return nil, fmt.Errorf("failed to list endpoints: %w", err)
} }
for _, endpoint := range endpoints { for _, endpoint := range endpoints {
equal := false equal := false

4
pkg/proxy/winkernel/proxier.go
View File

@ -664,7 +664,7 @@ func NewProxier(
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
hnsNetworkInfo, err = hns.getNetworkByName(hnsNetworkName) hnsNetworkInfo, err = hns.getNetworkByName(hnsNetworkName)
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not find HNS network %s", hnsNetworkName) return nil, fmt.Errorf("could not find HNS network %s", hnsNetworkName)
} }
} }
@ -714,7 +714,7 @@ func NewProxier(
} }
} }
if len(hostMac) == 0 { if len(hostMac) == 0 {
return nil, fmt.Errorf("Could not find host mac address for %s", nodeIP) return nil, fmt.Errorf("could not find host mac address for %s", nodeIP)
} }
} }