From 99430f51fd406607529a188ddae30b333bd59667 Mon Sep 17 00:00:00 2001 From: yangweiwei Date: Wed, 4 Sep 2019 15:05:00 +0800 Subject: [PATCH] Repaire incorrect ip version event When we config the wrong ip version and the endpoint updates the error event info. But the parameter call order is wrong. So we should fix it. --- pkg/proxy/endpoints.go | 2 +- pkg/proxy/endpointslicecache.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/proxy/endpoints.go b/pkg/proxy/endpoints.go index 9bf1bdd4a25..281c1cc9d21 100644 --- a/pkg/proxy/endpoints.go +++ b/pkg/proxy/endpoints.go @@ -323,7 +323,7 @@ func (ect *EndpointChangeTracker) endpointsToEndpointsMap(endpoints *v1.Endpoint if ect.isIPv6Mode != nil && utilnet.IsIPv6String(addr.IP) != *ect.isIPv6Mode { // Emit event on the corresponding service which had a different // IP version than the endpoint. - utilproxy.LogAndEmitIncorrectIPVersionEvent(ect.recorder, "endpoints", addr.IP, endpoints.Name, endpoints.Namespace, "") + utilproxy.LogAndEmitIncorrectIPVersionEvent(ect.recorder, "endpoints", addr.IP, endpoints.Namespace, endpoints.Name, "") continue } isLocal := addr.NodeName != nil && *addr.NodeName == ect.hostname diff --git a/pkg/proxy/endpointslicecache.go b/pkg/proxy/endpointslicecache.go index 229b7744424..57400735eb8 100644 --- a/pkg/proxy/endpointslicecache.go +++ b/pkg/proxy/endpointslicecache.go @@ -159,7 +159,7 @@ func (cache *EndpointSliceCache) addEndpointsByIP(serviceNN types.NamespacedName if cache.isIPv6Mode != nil && utilnet.IsIPv6String(endpoint.Addresses[0]) != *cache.isIPv6Mode { // Emit event on the corresponding service which had a different IP // version than the endpoint. - utilproxy.LogAndEmitIncorrectIPVersionEvent(cache.recorder, "endpointslice", endpoint.Addresses[0], serviceNN.Name, serviceNN.Namespace, "") + utilproxy.LogAndEmitIncorrectIPVersionEvent(cache.recorder, "endpointslice", endpoint.Addresses[0], serviceNN.Namespace, serviceNN.Name, "") continue }