Upgrade to Fedora 31

This requires upgrading to golangci-lint 1.18 to fix
golangci/golangci-lint#658 with Go 1.13.

Signed-off-by: Stephen Kitt <[email protected]>

Author: skitt

package/Dockerfile.dapper-base

@@ -1,8 +1,8 @@
-FROM fedora:30
+FROM fedora:31
 
 ENV DAPPER_HOST_ARCH=amd64
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
-    LINT_VERSION=v1.16.0 \
+    LINT_VERSION=v1.18.0 \
     HELM_VERSION=v2.14.1 \
     KIND_VERSION=v0.6.1 \
     KUBEFED_VERSION=0.1.0-rc2
@@ -32,9 +32,10 @@ ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARC
 # jq             | JSON processing (GitHub API)
 # diffutils      | required for goimports
 RUN dnf -y distrosync --nodocs --setopt=install_weak_deps=False && \
-    dnf -y install --nodocs --setopt=install_weak_deps=False gcc git-core curl moby-engine make golang kubernetes-client findutils upx jq && \
-    dnf -y remove acl dnf-yum langpacks-en libevent libsemanage libsss_idmap libxcrypt-compat mkpasswd openssl python3-pip python3-setuptools \
-           sssd-client unbound-libs whois-nls && \
+    dnf -y install --nodocs --setopt=install_weak_deps=False \
+                   gcc git-core curl moby-engine make golang kubernetes-client \
+                   findutils upx jq golang-x-tools-goimports && \
+    dnf -y remove libsemanage && \
     rpm -e --nodeps selinux-policy-targeted && \
     dnf -y clean all && \
     curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin ${LINT_VERSION} && \
@@ -44,7 +45,6 @@ RUN dnf -y distrosync --nodocs --setopt=install_weak_deps=False && \
     mv kubefedctl /usr/bin/ && chmod a+x /usr/bin/kubefedctl && \
     curl -Lo /usr/bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-${ARCH}" && chmod a+x /usr/bin/kind && \
     GOFLAGS="" go get -v github.com/onsi/ginkgo/ginkgo && \
-    GOFLAGS="" go get -v golang.org/x/tools/cmd/goimports && \
-    upx /go/bin/ginkgo /go/bin/goimports /go/bin/golangci-lint /usr/bin/containerd /usr/bin/docker /usr/bin/dockerd /usr/bin/helm /usr/bin/kubectl \
+    upx /go/bin/ginkgo /go/bin/golangci-lint /usr/bin/containerd /usr/bin/docker /usr/bin/dockerd /usr/bin/goimports /usr/bin/helm /usr/bin/kubectl \
         /usr/bin/kubefedctl && \
     ln -f /usr/bin/kubectl /usr/bin/hyperkube

test/e2e/e2e.go

@@ -45,6 +45,8 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {
 })
 
 func RunE2ETests(t *testing.T) {
+	framework.ValidateFlags(framework.TestContext)
+
 	gomega.RegisterFailHandler(ginkgo.Fail)
 
 	// If the ginkgo default for slow test was not modified, bump it to 45 seconds

test/e2e/e2e_test.go

@@ -3,19 +3,13 @@ package e2e
 import (
 	"testing"
 
-	"github.com/submariner-io/submariner/test/e2e/framework"
-
 	_ "github.com/submariner-io/submariner/test/e2e/cluster"
 	_ "github.com/submariner-io/submariner/test/e2e/dataplane"
 	_ "github.com/submariner-io/submariner/test/e2e/example"
+	_ "github.com/submariner-io/submariner/test/e2e/framework"
 	_ "github.com/submariner-io/submariner/test/e2e/redundancy"
 )
 
-func init() {
-	framework.ParseFlags()
-}
-
 func TestE2E(t *testing.T) {
-
 	RunE2ETests(t)
 }

test/e2e/framework/test_context.go

@@ -46,8 +46,8 @@ var TestContext *TestContextType = &TestContextType{
 	ClientBurst: 50,
 }
 
-func registerFlags(t *TestContextType) {
-	flag.StringVar(&t.KubeConfig, "kubeconfig", os.Getenv("KUBECONFIG"),
+func init() {
+	flag.StringVar(&TestContext.KubeConfig, "kubeconfig", os.Getenv("KUBECONFIG"),
 		"Path to kubeconfig containing embedded authinfo.")
 	flag.Var(&TestContext.KubeContexts, "dp-context", "kubeconfig context for dataplane clusters (use several times).")
 	flag.StringVar(&TestContext.ReportPrefix, "report-prefix", "", "Optional prefix for JUnit XML reports. Default is empty, which doesn't prepend anything to the default name.")
@@ -58,7 +58,7 @@ func registerFlags(t *TestContextType) {
 	flag.UintVar(&TestContext.OperationTimeout, "operation-timeout", 60, "The general operation timeout in seconds.")
 }
 
-func validateFlags(t *TestContextType) {
+func ValidateFlags(t *TestContextType) {
 	if len(t.KubeConfig) == 0 {
 		klog.Fatalf("kubeconfig parameter or KUBECONFIG environment variable is required")
 	}
@@ -67,9 +67,3 @@ func validateFlags(t *TestContextType) {
 		klog.Fatalf("several kubernetes contexts are necessary east, west, etc..")
 	}
 }
-
-func ParseFlags() {
-	registerFlags(TestContext)
-	flag.Parse()
-	validateFlags(TestContext)
-}