Merge pull request #1534 from luthermonson/jwt

update to golang v1.17 + go mod fixes for CVE

.github/workflows/build.yaml

@@ -3,7 +3,7 @@ name: build flannel
 on: [push, pull_request]
 
 env:
-  GO_VERSION: "1.15.15"
+  GO_VERSION: "1.17.2"
   LINUX_ARCHES: "amd64 arm arm64 s390x ppc64le mips64le"
 
 jobs:
@@ -77,4 +77,4 @@ jobs:
         with:
           context: .
           file: Dockerfile.mips64le
-          push: false
+          push: false

.github/workflows/e2eTests.yaml

@@ -10,7 +10,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.15
+        go-version: ^1.17
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - name: Run tests

.github/workflows/release.yml

@@ -3,7 +3,7 @@ on:
     types: [published]
 
 env:
-  GO_VERSION: "1.15.15"
+  GO_VERSION: "1.17.2"
   LINUX_ARCHES: "amd64 arm arm64 s390x ppc64le mips64le"
   REPOSITORY: flannelcni/flannel
 

Documentation/alicloud-vpc-backend-cn.md

@@ -87,4 +87,4 @@ sudo -E ./flanneld --etcd-endpoints=http://127.0.0.1:2379
 ### 限制
 
 
-阿里云每个路由表[限制](https://vpc.console.aliyun.com/#/vpc/cn-hangzhou/detail/vpc-bp11xpfe5ev6wvhfb14b6/router)最多只能创建48个自定义路由条目。如果你需要更多的路由规则，可以发工单请求更多的配合或者切换到 VXLAN 后台模式。
+阿里云每个路由表[限制](https://vpc.console.aliyun.com/#/vpc/cn-hangzhou/detail/vpc-bp11xpfe5ev6wvhfb14b6/router)最多只能创建48个自定义路由条目。如果你需要更多的路由规则，可以发工单请求更多的配合或者切换到 VXLAN 后台模式。

Documentation/extension.md

@@ -56,4 +56,4 @@ An example
     "SubnetAddCommand": "export SUBNET_IP=`echo $SUBNET | cut -d'/' -f 1`; export IF_NAME=flannel-vxlan; read VTEP; ip route add $SUBNET nexthop via $SUBNET_IP dev $IF_NAME onlink && arp -s $SUBNET_IP $VTEP dev $IF_NAME && bridge fdb add $VTEP dev $IF_NAME self dst $PUBLIC_IP"
   }
 }
-```
+```

Makefile

@@ -15,10 +15,10 @@ else
 endif
 
 # Go version to use for builds
-GO_VERSION=1.15.5
+GO_VERSION=1.17.2
 
 # K8s version used for Makefile helpers
-K8S_VERSION=v1.6.6
+K8S_VERSION=v1.22.3
 
 GOARM=7
 
@@ -73,7 +73,11 @@ test: header-check gofmt verify-modules
 	# Run the unit tests
 	# NET_ADMIN capacity is required to do some network operation
 	# SYS_ADMIN capacity is required to create network namespace
-	docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN --rm -v $(shell pwd):/go/src/github.com/flannel-io/flannel golang:$(GO_VERSION) go test -v -cover $(TEST_PACKAGES_EXPANDED)
+	docker run --cap-add=NET_ADMIN \
+		--cap-add=SYS_ADMIN --rm \
+		-v $(shell pwd):/go/src/github.com/flannel-io/flannel \
+		golang:$(GO_VERSION) \
+		/bin/bash -c 'cd /go/src/github.com/flannel-io/flannel && go test -v -cover $(TEST_PACKAGES_EXPANDED)'
 
 	# Test the docker-opts script
 	cd dist; ./mk-docker-opts_tests.sh

backend/alivpc/alivpc.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package alivpc

backend/alloc/alloc.go

@@ -16,11 +16,12 @@ package alloc
 
 import (
 	"fmt"
+	"sync"
+
 	"github.com/flannel-io/flannel/backend"
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/subnet"
 	"golang.org/x/net/context"
-	"sync"
 )
 
 func init() {

backend/awsvpc/awsvpc.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package awsvpc

backend/awsvpc/filter.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package awsvpc

backend/gce/api.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package gce

backend/gce/gce.go

@@ -34,6 +34,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
+//go:build !windows
 // +build !windows
 
 package gce

backend/gce/metadata.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package gce

backend/hostgw/hostgw.go

@@ -1,4 +1,5 @@
-// +build !windows
+//go:build !windows && !windows
+// +build !windows,!windows
 
 // Copyright 2015 flannel authors
 //
@@ -13,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build !windows
 
 package hostgw
 

backend/ipip/ipip.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // Copyright 2017 flannel authors

backend/ipip/ipip_windows.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build windows
 // +build windows
 
 package ipip

backend/ipsec/handle_charon.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package ipsec

backend/ipsec/handle_xfrm.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package ipsec

backend/ipsec/ipsec.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package ipsec

backend/ipsec/ipsec_network.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package ipsec

backend/route_network.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // Copyright 2017 flannel authors

backend/route_network_test.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package backend

backend/tencentvpc/tencentvpc.go

@@ -11,25 +11,27 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package tencentvpc
 
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"sync"
+
 	"github.com/flannel-io/flannel/backend"
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/subnet"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 	"golang.org/x/net/context"
-	"io/ioutil"
 	log "k8s.io/klog"
-	"net/http"
-	"os"
-	"sync"
 )
 
 func init() {

backend/udp/cproxy_amd64.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package udp

backend/udp/udp.go

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build !amd64
-// +build !windows
+//go:build !amd64 && !windows
+// +build !amd64,!windows
 
 package udp
 

backend/udp/udp_amd64.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package udp

backend/udp/udp_network.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !amd64 && !windows
 // +build !amd64,!windows
 
 package udp

backend/udp/udp_network_amd64.go

@@ -1,4 +1,5 @@
-// +build !windows
+//go:build !windows && !windows
+// +build !windows,!windows
 
 // Copyright 2015 flannel authors
 //
@@ -13,7 +14,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build !windows
 
 package udp
 

backend/vxlan/device.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // Copyright 2015 flannel authors

backend/vxlan/device_windows.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build windows
 // +build windows
 
 package vxlan

backend/vxlan/vxlan.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package vxlan

backend/vxlan/vxlan_network.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//go:build !windows
 // +build !windows
 
 package vxlan

backend/wireguard/wireguard.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // Copyright 2021 flannel authors

backend/wireguard/wireguard_network.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // Copyright 2021 flannel authors

backend/wireguard/wireguard_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 // Copyright 2021 flannel authors

dist/extension-hostgw

@@ -5,4 +5,4 @@
     "SubnetAddCommand": "ip route add $SUBNET via $PUBLIC_IP",
     "SubnetRemoveCommand": "ip route del $SUBNET via $PUBLIC_IP"
   }
-}
+}

dist/extension-vxlan

@@ -7,4 +7,4 @@
     "ShutdownCommand": "export IF_NAME=flannel-vxlan; ip link del $IF_NAME",
     "SubnetAddCommand": "export SUBNET_IP=`echo $SUBNET | cut -d'/' -f 1`; export IF_NAME=flannel-vxlan; read VTEP; ip route add $SUBNET nexthop via $SUBNET_IP dev $IF_NAME onlink && arp -s $SUBNET_IP $VTEP dev $IF_NAME && bridge fdb add $VTEP dev $IF_NAME self dst $PUBLIC_IP"
   }
-}
+}

dist/iptables-wrapper-installer.sh

@@ -215,4 +215,4 @@ case "${altstyle}" in
 esac
 
 # Cleanup
-rm -f "$0"
+rm -f "$0"

dist/license-check.sh

@@ -6,4 +6,4 @@ licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*'); do
 if [ -n "${licRes}" ]; then
 	echo -e "license header checking failed:\n${licRes}"
 	exit 255
-fi
+fi