Skip to content

Commit 10644ce

Browse files
lubronzhanlubronzhan
authored
Merge pull request #99 from lubronzhan/topic/lubron/bump_golangci-lint
Bump golangci-lint to 1.55.2
2 parents cebb948 + a2c6c9d commit 10644ce

File tree

6 files changed

+49
-53
lines changed

6 files changed

+49
-53
lines changed

‎.github/workflows/pr.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ jobs:
1313
- name: golangci-lint
1414
uses: golangci/golangci-lint-action@v3
1515
with:
16-
version: v1.42.0
16+
version: v1.55.2
17+
args: --out-format=colored-line-number
1718
test-linux:
1819
runs-on: ubuntu-latest
1920
steps:

‎main.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ package main
1818

1919
import (
2020
"fmt"
21-
"math/rand"
2221
"os"
23-
"time"
2422

2523
"github.com/kube-vip/kube-vip-cloud-provider/pkg/provider"
2624
"github.com/spf13/pflag"
@@ -37,7 +35,7 @@ import (
3735
)
3836

3937
func main() {
40-
rand.Seed(time.Now().UnixNano())
38+
// a random number generator will be seeded automatically
4139

4240
logs.InitLogs()
4341
defer logs.FlushLogs()

‎pkg/provider/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ import (
4747

4848
func (k *kubevipLoadBalancerManager) GetConfigMap(ctx context.Context, cm, nm string) (*v1.ConfigMap, error) {
4949
// Attempt to retrieve the config map
50-
return k.kubeClient.CoreV1().ConfigMaps(nm).Get(ctx, k.cloudConfigMap, metav1.GetOptions{})
50+
return k.kubeClient.CoreV1().ConfigMaps(nm).Get(ctx, cm, metav1.GetOptions{})
5151
}
5252

5353
func (k *kubevipLoadBalancerManager) CreateConfigMap(ctx context.Context, cm, nm string) (*v1.ConfigMap, error) {
5454
// Create new configuration map in the correct namespace
5555
newConfigMap := v1.ConfigMap{
5656
ObjectMeta: metav1.ObjectMeta{
57-
Name: k.cloudConfigMap,
57+
Name: cm,
5858
Namespace: nm,
5959
},
6060
}

‎pkg/provider/loadBalancer.go

+29-29
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,20 @@ func newLoadBalancer(kubeClient kubernetes.Interface, ns, cm string) cloudprovid
4343
return k
4444
}
4545

46-
func (k *kubevipLoadBalancerManager) EnsureLoadBalancer(ctx context.Context, clusterName string, service *v1.Service, nodes []*v1.Node) (lbs *v1.LoadBalancerStatus, err error) {
46+
func (k *kubevipLoadBalancerManager) EnsureLoadBalancer(ctx context.Context, _ string, service *v1.Service, _ []*v1.Node) (lbs *v1.LoadBalancerStatus, err error) {
4747
return k.syncLoadBalancer(ctx, service)
4848
}
49-
func (k *kubevipLoadBalancerManager) UpdateLoadBalancer(ctx context.Context, clusterName string, service *v1.Service, nodes []*v1.Node) (err error) {
49+
50+
func (k *kubevipLoadBalancerManager) UpdateLoadBalancer(ctx context.Context, _ string, service *v1.Service, _ []*v1.Node) (err error) {
5051
_, err = k.syncLoadBalancer(ctx, service)
5152
return err
5253
}
5354

54-
func (k *kubevipLoadBalancerManager) EnsureLoadBalancerDeleted(ctx context.Context, clusterName string, service *v1.Service) error {
55+
func (k *kubevipLoadBalancerManager) EnsureLoadBalancerDeleted(ctx context.Context, _ string, service *v1.Service) error {
5556
return k.deleteLoadBalancer(ctx, service)
5657
}
5758

58-
func (k *kubevipLoadBalancerManager) GetLoadBalancer(ctx context.Context, clusterName string, service *v1.Service) (status *v1.LoadBalancerStatus, exists bool, err error) {
59+
func (k *kubevipLoadBalancerManager) GetLoadBalancer(_ context.Context, _ string, service *v1.Service) (status *v1.LoadBalancerStatus, exists bool, err error) {
5960
if service.Labels[implementationLabelKey] == implementationLabelValue {
6061
return &service.Status.LoadBalancer, true, nil
6162
}
@@ -64,7 +65,7 @@ func (k *kubevipLoadBalancerManager) GetLoadBalancer(ctx context.Context, cluste
6465

6566
// GetLoadBalancerName returns the name of the load balancer. Implementations must treat the
6667
// *v1.Service parameter as read-only and not modify it.
67-
func (k *kubevipLoadBalancerManager) GetLoadBalancerName(_ context.Context, clusterName string, service *v1.Service) string {
68+
func (k *kubevipLoadBalancerManager) GetLoadBalancerName(_ context.Context, _ string, service *v1.Service) string {
6869
return getDefaultLoadBalancerName(service)
6970
}
7071

@@ -116,32 +117,32 @@ func (k *kubevipLoadBalancerManager) syncLoadBalancer(ctx context.Context, servi
116117
}
117118
}
118119
return &service.Status.LoadBalancer, nil
119-
} else {
120-
if v, ok := service.Annotations[loadbalancerIPsAnnotations]; ok && len(v) != 0 {
121-
klog.Infof("service '%s/%s' annotations '%s' is defined but service.Spec.LoadBalancerIP is not. Assume it's not legacy service", service.Namespace, service.Name, loadbalancerIPsAnnotations)
122-
// Set Label for service lookups
123-
if service.Labels == nil || service.Labels[implementationLabelKey] != implementationLabelValue {
124-
klog.Infof("service '%s/%s' created with pre-defined ip '%s'", service.Namespace, service.Name, v)
125-
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
126-
recentService, getErr := k.kubeClient.CoreV1().Services(service.Namespace).Get(ctx, service.Name, metav1.GetOptions{})
127-
if getErr != nil {
128-
return getErr
129-
}
130-
if recentService.Labels == nil {
131-
// Just because ..
132-
recentService.Labels = make(map[string]string)
133-
}
134-
recentService.Labels[implementationLabelKey] = implementationLabelValue
135-
// Update the actual service with the annotations
136-
_, updateErr := k.kubeClient.CoreV1().Services(recentService.Namespace).Update(ctx, recentService, metav1.UpdateOptions{})
137-
return updateErr
138-
})
139-
if err != nil {
140-
return nil, fmt.Errorf("error updating Service Spec [%s] : %v", service.Name, err)
120+
}
121+
122+
if v, ok := service.Annotations[loadbalancerIPsAnnotations]; ok && len(v) != 0 {
123+
klog.Infof("service '%s/%s' annotations '%s' is defined but service.Spec.LoadBalancerIP is not. Assume it's not legacy service", service.Namespace, service.Name, loadbalancerIPsAnnotations)
124+
// Set Label for service lookups
125+
if service.Labels == nil || service.Labels[implementationLabelKey] != implementationLabelValue {
126+
klog.Infof("service '%s/%s' created with pre-defined ip '%s'", service.Namespace, service.Name, v)
127+
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
128+
recentService, getErr := k.kubeClient.CoreV1().Services(service.Namespace).Get(ctx, service.Name, metav1.GetOptions{})
129+
if getErr != nil {
130+
return getErr
141131
}
132+
if recentService.Labels == nil {
133+
// Just because ..
134+
recentService.Labels = make(map[string]string)
135+
}
136+
recentService.Labels[implementationLabelKey] = implementationLabelValue
137+
// Update the actual service with the annotations
138+
_, updateErr := k.kubeClient.CoreV1().Services(recentService.Namespace).Update(ctx, recentService, metav1.UpdateOptions{})
139+
return updateErr
140+
})
141+
if err != nil {
142+
return nil, fmt.Errorf("error updating Service Spec [%s] : %v", service.Name, err)
142143
}
143-
return &service.Status.LoadBalancer, nil
144144
}
145+
return &service.Status.LoadBalancer, nil
145146
}
146147

147148
// Get the clound controller configuration map
@@ -157,7 +158,6 @@ func (k *kubevipLoadBalancerManager) syncLoadBalancer(ctx context.Context, servi
157158

158159
// Get ip pool from configmap and determine if it is namespace specific or global
159160
pool, global, err := discoverPool(controllerCM, service.Namespace, k.cloudConfigMap)
160-
161161
if err != nil {
162162
return nil, err
163163
}

‎pkg/provider/loadBalancer_test.go

+6-8
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func Test_DiscoveryPoolCIDR(t *testing.T) {
6767

6868
for _, tt := range tests {
6969
t.Run(tt.name, func(t *testing.T) {
70-
gotString, gotBool, err := discoverPool(&tt.args.data, tt.args.cidr, "")
70+
gotString, gotBool, err := discoverPool(&tt.args.data, tt.args.cidr, "") // #nosec G601
7171
if (err != nil) != tt.wantErr {
7272
t.Errorf("discoverPool() error: %v, expected: %v", err, tt.wantErr)
7373
return
@@ -134,7 +134,7 @@ func Test_DiscoveryPoolRange(t *testing.T) {
134134

135135
for _, tt := range tests {
136136
t.Run(tt.name, func(t *testing.T) {
137-
gotString, gotBool, err := discoverPool(&tt.args.data, tt.args.ipRange, "")
137+
gotString, gotBool, err := discoverPool(&tt.args.data, tt.args.ipRange, "") // #nosec G601
138138
if (err != nil) != tt.wantErr {
139139
t.Errorf("discoverPool() error: %v, expected: %v", err, tt.wantErr)
140140
return
@@ -172,7 +172,7 @@ func Test_DiscoveryAddressCIDR(t *testing.T) {
172172
{
173173
name: "available ip search for unknown namespace",
174174
args: args{
175-
"unknwon",
175+
"unknown",
176176
"192.168.1.1/24",
177177
[]string{"10.10.10.8", "172.16.0.3", "192.168.1.1", "10.10.10.9", "10.10.10.10", "172.16.0.4", "192.168.1.2", "10.10.10.12"},
178178
},
@@ -192,7 +192,7 @@ func Test_DiscoveryAddressCIDR(t *testing.T) {
192192
{
193193
name: "ipv6, available ip search for unknown namespace",
194194
args: args{
195-
"unknwon",
195+
"unknown",
196196
"fe80::10/126",
197197
[]string{"fe80::10", "fe80::11", "fe80::12"},
198198
},
@@ -647,11 +647,9 @@ func Test_discoverVIPs(t *testing.T) {
647647
}
648648
})
649649
}
650-
651650
}
652651

653652
func Test_syncLoadBalancer(t *testing.T) {
654-
655653
tests := []struct {
656654
name string
657655
serviceNamespace string
@@ -877,7 +875,7 @@ func Test_syncLoadBalancer(t *testing.T) {
877875
}
878876

879877
// create dummy service
880-
_, err := mgr.kubeClient.CoreV1().Services("test").Create(context.Background(), &tt.originalService, metav1.CreateOptions{})
878+
_, err := mgr.kubeClient.CoreV1().Services("test").Create(context.Background(), &tt.originalService, metav1.CreateOptions{}) // #nosec G601
881879
if err != nil {
882880
t.Error(err)
883881
}
@@ -890,7 +888,7 @@ func Test_syncLoadBalancer(t *testing.T) {
890888
}
891889
}
892890

893-
_, err = mgr.syncLoadBalancer(context.Background(), &tt.originalService)
891+
_, err = mgr.syncLoadBalancer(context.Background(), &tt.originalService) // #nosec G601
894892
if err != nil {
895893
t.Error(err)
896894
}

‎pkg/provider/provider.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package provider
33
import (
44
"fmt"
55
"io"
6-
"path/filepath"
7-
86
"os"
7+
"path/filepath"
98

109
"k8s.io/client-go/informers"
1110
"k8s.io/client-go/kubernetes"
@@ -20,16 +19,16 @@ import (
2019
var OutSideCluster bool
2120

2221
const (
23-
//ProviderName is the name of the cloud provider
22+
// ProviderName is the name of the cloud provider
2423
ProviderName = "kubevip"
2524

26-
//KubeVipClientConfig is the default name of the load balancer config Map
25+
// KubeVipClientConfig is the default name of the load balancer config Map
2726
KubeVipClientConfig = "kubevip"
2827

29-
//KubeVipClientConfig is the default namespace of the load balancer config Map
28+
// KubeVipClientConfig is the default namespace of the load balancer config Map
3029
KubeVipClientConfigNamespace = "kube-system"
3130

32-
//KubeVipServicesKey is the key in the ConfigMap that has the services configuration
31+
// KubeVipServicesKey is the key in the ConfigMap that has the services configuration
3332
KubeVipServicesKey = "kubevip-services"
3433
)
3534

@@ -88,16 +87,16 @@ func newKubeVipCloudProvider(io.Reader) (cloudprovider.Interface, error) {
8887
}
8988

9089
// Initialize - starts the clound-provider controller
91-
func (p *KubeVipCloudProvider) Initialize(clientBuilder cloudprovider.ControllerClientBuilder, stop <-chan struct{}) {
90+
func (p *KubeVipCloudProvider) Initialize(clientBuilder cloudprovider.ControllerClientBuilder, _ <-chan struct{}) {
9291
clientset := clientBuilder.ClientOrDie("do-shared-informers")
9392
sharedInformer := informers.NewSharedInformerFactory(clientset, 0)
9493

95-
//res := NewResourcesController(c.resources, sharedInformer.Core().V1().Services(), clientset)
94+
// res := NewResourcesController(c.resources, sharedInformer.Core().V1().Services(), clientset)
9695

9796
sharedInformer.Start(nil)
9897
sharedInformer.WaitForCacheSync(nil)
99-
//go res.Run(stop)
100-
//go c.serveDebug(stop)
98+
// go res.Run(stop)
99+
// go c.serveDebug(stop)
101100
}
102101

103102
// LoadBalancer returns a loadbalancer interface. Also returns true if the interface is supported, false otherwise.

0 commit comments

Comments
 (0)