github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

style: update several golint errors in winkernel

Browse Source
This commit is contained in:
draveness 2019-05-06 20:28:09 +08:00
parent 43ce2f17cf
commit fabc628210
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ func (hns hnsV2) getNetworkByName(name string) (*hnsNetworkInfo, error) {
} }
rs := &remoteSubnetInfo{ rs := &remoteSubnetInfo{
destinationPrefix: policySettings.DestinationPrefix, destinationPrefix: policySettings.DestinationPrefix,
isolationId: policySettings.IsolationId, isolationID: policySettings.IsolationId,
providerAddress: policySettings.ProviderAddress, providerAddress: policySettings.ProviderAddress,
drMacAddress: policySettings.DistributedRouterMacAddress, drMacAddress: policySettings.DistributedRouterMacAddress,
} }

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

@ -122,7 +122,7 @@ type hnsNetworkInfo struct {
type remoteSubnetInfo struct { type remoteSubnetInfo struct {
destinationPrefix string destinationPrefix string
isolationId uint16 isolationID uint16
providerAddress string providerAddress string
drMacAddress string drMacAddress string
} }
@ -649,13 +649,13 @@ func (svcInfo *serviceInfo) deleteAllHnsLoadBalancerPolicy() {
hns.deleteLoadBalancer(svcInfo.nodePorthnsID) hns.deleteLoadBalancer(svcInfo.nodePorthnsID)
svcInfo.nodePorthnsID = "" svcInfo.nodePorthnsID = ""
for _, externalIp := range svcInfo.externalIPs { for _, externalIP := range svcInfo.externalIPs {
hns.deleteLoadBalancer(externalIp.hnsID) hns.deleteLoadBalancer(externalIP.hnsID)
externalIp.hnsID = "" externalIP.hnsID = ""
} }
for _, lbIngressIp := range svcInfo.loadBalancerIngressIPs { for _, lbIngressIP := range svcInfo.loadBalancerIngressIPs {
hns.deleteLoadBalancer(lbIngressIp.hnsID) hns.deleteLoadBalancer(lbIngressIP.hnsID)
lbIngressIp.hnsID = "" lbIngressIP.hnsID = ""
} }
} }
@ -764,8 +764,8 @@ func shouldSkipService(svcName types.NamespacedName, service *v1.Service) bool {
func (proxier *Proxier) updateServiceMap() (result updateServiceMapResult) { func (proxier *Proxier) updateServiceMap() (result updateServiceMapResult) {
result.staleServices = sets.NewString() result.staleServices = sets.NewString()
var serviceMap proxyServiceMap = proxier.serviceMap serviceMap := proxier.serviceMap
var changes *serviceChangeMap = &proxier.serviceChanges changes := &proxier.serviceChanges
func() { func() {
changes.lock.Lock() changes.lock.Lock()
@ -826,8 +826,8 @@ func (proxier *Proxier) updateEndpointsMap() (result updateEndpointMapResult) {
result.staleEndpoints = make(map[endpointServicePair]bool) result.staleEndpoints = make(map[endpointServicePair]bool)
result.staleServiceNames = make(map[proxy.ServicePortName]bool) result.staleServiceNames = make(map[proxy.ServicePortName]bool)
var endpointsMap proxyEndpointsMap = proxier.endpointsMap endpointsMap := proxier.endpointsMap
var changes *endpointsChangeMap = &proxier.endpointsChanges changes := &proxier.endpointsChanges
func() { func() {
changes.lock.Lock() changes.lock.Lock()
@ -1150,14 +1150,14 @@ func (proxier *Proxier) syncProxyRules() {
} }
// Create a Load Balancer Policy for each external IP // Create a Load Balancer Policy for each external IP
for _, externalIp := range svcInfo.externalIPs { for _, externalIP := range svcInfo.externalIPs {
// Try loading existing policies, if already available // Try loading existing policies, if already available
hnsLoadBalancer, err = hns.getLoadBalancer( hnsLoadBalancer, err = hns.getLoadBalancer(
hnsEndpoints, hnsEndpoints,
false, false,
false, false,
sourceVip, sourceVip,
externalIp.ip, externalIP.ip,
Enum(svcInfo.protocol), Enum(svcInfo.protocol),
uint16(svcInfo.targetPort), uint16(svcInfo.targetPort),
uint16(svcInfo.port), uint16(svcInfo.port),
@ -1166,18 +1166,18 @@ func (proxier *Proxier) syncProxyRules() {
klog.Errorf("Policy creation failed: %v", err) klog.Errorf("Policy creation failed: %v", err)
continue continue
} }
externalIp.hnsID = hnsLoadBalancer.hnsID externalIP.hnsID = hnsLoadBalancer.hnsID
klog.V(3).Infof("Hns LoadBalancer resource created for externalIp resources %v, Id[%s]", externalIp, hnsLoadBalancer.hnsID) klog.V(3).Infof("Hns LoadBalancer resource created for externalIP resources %v, Id[%s]", externalIP, hnsLoadBalancer.hnsID)
} }
// Create a Load Balancer Policy for each loadbalancer ingress // Create a Load Balancer Policy for each loadbalancer ingress
for _, lbIngressIp := range svcInfo.loadBalancerIngressIPs { for _, lbIngressIP := range svcInfo.loadBalancerIngressIPs {
// Try loading existing policies, if already available // Try loading existing policies, if already available
hnsLoadBalancer, err := hns.getLoadBalancer( hnsLoadBalancer, err := hns.getLoadBalancer(
hnsEndpoints, hnsEndpoints,
false, false,
false, false,
sourceVip, sourceVip,
lbIngressIp.ip, lbIngressIP.ip,
Enum(svcInfo.protocol), Enum(svcInfo.protocol),
uint16(svcInfo.targetPort), uint16(svcInfo.targetPort),
uint16(svcInfo.port), uint16(svcInfo.port),
@ -1186,8 +1186,8 @@ func (proxier *Proxier) syncProxyRules() {
klog.Errorf("Policy creation failed: %v", err) klog.Errorf("Policy creation failed: %v", err)
continue continue
} }
lbIngressIp.hnsID = hnsLoadBalancer.hnsID lbIngressIP.hnsID = hnsLoadBalancer.hnsID
klog.V(3).Infof("Hns LoadBalancer resource created for loadBalancer Ingress resources %v", lbIngressIp) klog.V(3).Infof("Hns LoadBalancer resource created for loadBalancer Ingress resources %v", lbIngressIP)
} }
svcInfo.policyApplied = true svcInfo.policyApplied = true
Log(svcInfo, "+++Policy Successfully applied for service +++", 2) Log(svcInfo, "+++Policy Successfully applied for service +++", 2)

2
pkg/proxy/winkernel/proxier_test.go
View File

@ -68,7 +68,7 @@ func (hns fakeHNS) getNetworkByName(name string) (*hnsNetworkInfo, error) {
var remoteSubnets []*remoteSubnetInfo var remoteSubnets []*remoteSubnetInfo
rs := &remoteSubnetInfo{ rs := &remoteSubnetInfo{
destinationPrefix: destinationPrefix, destinationPrefix: destinationPrefix,
isolationId: 4096, isolationID: 4096,
providerAddress: providerAddress, providerAddress: providerAddress,
drMacAddress: macAddress, drMacAddress: macAddress,
} }