fix(linting): special linting fix for v1.5 branch

cloudnativelabs · Oct 19, 2022 · fb5905e · fb5905e
1 parent 62b15c6
commit fb5905e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/pkg/controllers/routing/ecmp_vip.go b/pkg/controllers/routing/ecmp_vip.go
@@ -10,7 +10,7 @@ import (
 
 	"strings"
 
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	gobgpapi "github.com/osrg/gobgp/api"
@@ -26,16 +26,16 @@ func (nrc *NetworkRoutingController) bgpAdvertiseVIP(vip string) error {
 	klog.V(2).Infof("Advertising route: '%s/%s via %s' to peers",
 		vip, strconv.Itoa(32), nrc.nodeIP.String())
 
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	a1, _ := ptypes.MarshalAny(&gobgpapi.OriginAttribute{
 		Origin: 0,
 	})
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	a2, _ := ptypes.MarshalAny(&gobgpapi.NextHopAttribute{
 		NextHop: nrc.nodeIP.String(),
 	})
 	attrs := []*any.Any{a1, a2}
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	nlri1, _ := ptypes.MarshalAny(&gobgpapi.IPAddressPrefix{
 		Prefix:    vip,
 		PrefixLen: 32,
@@ -56,16 +56,16 @@ func (nrc *NetworkRoutingController) bgpWithdrawVIP(vip string) error {
 	klog.V(2).Infof("Withdrawing route: '%s/%s via %s' to peers",
 		vip, strconv.Itoa(32), nrc.nodeIP.String())
 
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	a1, _ := ptypes.MarshalAny(&gobgpapi.OriginAttribute{
 		Origin: 0,
 	})
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	a2, _ := ptypes.MarshalAny(&gobgpapi.NextHopAttribute{
 		NextHop: nrc.nodeIP.String(),
 	})
 	attrs := []*any.Any{a1, a2}
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	nlri, _ := ptypes.MarshalAny(&gobgpapi.IPAddressPrefix{
 		Prefix:    vip,
 		PrefixLen: 32,

diff --git a/pkg/controllers/routing/network_routes_controller.go b/pkg/controllers/routing/network_routes_controller.go
@@ -21,7 +21,7 @@ import (
 	"github.com/coreos/go-iptables/iptables"
 	"github.com/golang/protobuf/ptypes/any"
 
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	"github.com/golang/protobuf/ptypes"
 	gobgpapi "github.com/osrg/gobgp/api"
 	gobgp "github.com/osrg/gobgp/pkg/server"
@@ -482,16 +482,16 @@ func (nrc *NetworkRoutingController) advertisePodRoute() error {
 			Afi:  gobgpapi.Family_AFI_IP6,
 			Safi: gobgpapi.Family_SAFI_UNICAST,
 		}
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		nlri, _ := ptypes.MarshalAny(&gobgpapi.IPAddressPrefix{
 			PrefixLen: uint32(cidrLen),
 			Prefix:    cidrStr[0],
 		})
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		a1, _ := ptypes.MarshalAny(&gobgpapi.OriginAttribute{
 			Origin: 0,
 		})
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		v6Attrs, _ := ptypes.MarshalAny(&gobgpapi.MpReachNLRIAttribute{
 			Family:   v6Family,
 			NextHops: []string{nrc.nodeIP.String()},
@@ -510,17 +510,17 @@ func (nrc *NetworkRoutingController) advertisePodRoute() error {
 	} else {
 
 		klog.V(2).Infof("Advertising route: '%s/%d via %s' to peers", subnet, cidrLen, nrc.nodeIP.String())
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		nlri, _ := ptypes.MarshalAny(&gobgpapi.IPAddressPrefix{
 			PrefixLen: uint32(cidrLen),
 			Prefix:    cidrStr[0],
 		})
 
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		a1, _ := ptypes.MarshalAny(&gobgpapi.OriginAttribute{
 			Origin: 0,
 		})
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		a2, _ := ptypes.MarshalAny(&gobgpapi.NextHopAttribute{
 			NextHop: nrc.nodeIP.String(),
 		})

diff --git a/pkg/controllers/routing/network_routes_controller_test.go b/pkg/controllers/routing/network_routes_controller_test.go
@@ -16,7 +16,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
 
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	"github.com/golang/protobuf/ptypes"
 	gobgpapi "github.com/osrg/gobgp/api"
 	gobgp "github.com/osrg/gobgp/pkg/server"
@@ -231,7 +231,7 @@ func Test_advertiseClusterIPs(t *testing.T) {
 			for _, path := range events {
 				nlri := path.GetNlri()
 				var prefix gobgpapi.IPAddressPrefix
-				// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+				//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 				err := ptypes.UnmarshalAny(nlri, &prefix)
 				if err != nil {
 					t.Fatalf("Invalid nlri in advertised path")
@@ -585,7 +585,7 @@ func Test_advertiseExternalIPs(t *testing.T) {
 			for _, path := range events {
 				nlri := path.GetNlri()
 				var prefix gobgpapi.IPAddressPrefix
-				// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+				//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 				err := ptypes.UnmarshalAny(nlri, &prefix)
 				if err != nil {
 					t.Fatalf("Invalid nlri in advertised path")
@@ -777,7 +777,7 @@ func Test_advertiseAnnotationOptOut(t *testing.T) {
 			for _, path := range events {
 				nlri := path.GetNlri()
 				var prefix gobgpapi.IPAddressPrefix
-				// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+				//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 				err := ptypes.UnmarshalAny(nlri, &prefix)
 				if err != nil {
 					t.Fatalf("Invalid nlri in advertised path")
@@ -1002,7 +1002,7 @@ func Test_advertiseAnnotationOptIn(t *testing.T) {
 			for _, path := range events {
 				nlri := path.GetNlri()
 				var prefix gobgpapi.IPAddressPrefix
-				// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+				//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 				err := ptypes.UnmarshalAny(nlri, &prefix)
 				if err != nil {
 					t.Fatalf("Invalid nlri in advertised path")
@@ -1298,7 +1298,7 @@ func Test_advertisePodRoute(t *testing.T) {
 			for _, path := range events {
 				nlri := path.GetNlri()
 				var prefix gobgpapi.IPAddressPrefix
-				// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+				//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 				err := ptypes.UnmarshalAny(nlri, &prefix)
 				if err != nil {
 					t.Fatalf("Invalid nlri in advertised path")

diff --git a/pkg/controllers/routing/utils.go b/pkg/controllers/routing/utils.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	"github.com/golang/protobuf/ptypes"
 	gobgpapi "github.com/osrg/gobgp/api"
 	"github.com/osrg/gobgp/pkg/packet/bgp"
@@ -177,9 +177,9 @@ func validateCommunity(arg string) error {
 // can't parse a next hop IP from the GoBGP Path, it returns an error.
 func parseBGPNextHop(path *gobgpapi.Path) (net.IP, error) {
 	for _, pAttr := range path.GetPattrs() {
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		var value ptypes.DynamicAny
-		// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+		//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 		if err := ptypes.UnmarshalAny(pAttr, &value); err != nil {
 			return nil, fmt.Errorf("failed to unmarshal path attribute: %s", err)
 		}
@@ -209,7 +209,7 @@ func parseBGPPath(path *gobgpapi.Path) (*net.IPNet, net.IP, error) {
 
 	nlri := path.GetNlri()
 	var prefix gobgpapi.IPAddressPrefix
-	// nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
+	//nolint:staticcheck // this has to stick around for now until gobgp updates protobuf
 	err = ptypes.UnmarshalAny(nlri, &prefix)
 	if err != nil {
 		return nil, nil, fmt.Errorf("invalid nlri in advertised path")