Merge pull request #2938 from caseydavenport/casey-fix-release

Fix release target

Makefile

@@ -527,7 +527,7 @@ release-tag: release-prereqs release-notes
 	@echo ""
 
 ## Produces a clean build of release artifacts at the specified version.
-release-build: release-prereqs clean
+release-build: release-prereqs clean $(GENERATED_FILES)
 # Check that the correct code is checked out.
 ifneq ($(VERSION), $(GIT_VERSION))
 	$(error Attempt to build $(VERSION) from $(GIT_VERSION))

bpf/xdp/attach.go

@@ -25,8 +25,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/projectcalico/felix/bpf"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/projectcalico/felix/bpf"
 )
 
 type AttachPoint struct {

calc/resources_for_test.go

@@ -18,14 +18,15 @@ package calc_test
 // the model package.
 
 import (
+	v1 "k8s.io/api/core/v1"
+	discovery "k8s.io/api/discovery/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/projectcalico/api/pkg/lib/numorstring"
 	"github.com/projectcalico/libcalico-go/lib/backend/encap"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	. "github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/net"
-	v1 "k8s.io/api/core/v1"
-	discovery "k8s.io/api/discovery/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // Canned hostnames.

fv/service_policy_test.go

@@ -23,15 +23,16 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	v1 "k8s.io/api/core/v1"
+	discovery "k8s.io/api/discovery/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	api "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
 	"github.com/projectcalico/libcalico-go/lib/apiconfig"
 	client "github.com/projectcalico/libcalico-go/lib/clientv3"
 	"github.com/projectcalico/libcalico-go/lib/ipam"
 	"github.com/projectcalico/libcalico-go/lib/net"
 	"github.com/projectcalico/libcalico-go/lib/options"
-	v1 "k8s.io/api/core/v1"
-	discovery "k8s.io/api/discovery/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/projectcalico/felix/fv/connectivity"
 	"github.com/projectcalico/felix/fv/infrastructure"

serviceindex/serviceindex_test.go

@@ -15,12 +15,13 @@
 package serviceindex_test
 
 import (
-	"github.com/projectcalico/felix/labelindex"
-	. "github.com/projectcalico/felix/serviceindex"
 	v1 "k8s.io/api/core/v1"
 	discovery "k8s.io/api/discovery/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/projectcalico/felix/labelindex"
+	. "github.com/projectcalico/felix/serviceindex"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"