Merge pull request #260 from erikwilson/fix-validation

Re-enable build validation

pkg/cli/cmds/agent.go

@@ -10,7 +10,7 @@ import (
 type Agent struct {
 	Token                    string
 	TokenFile                string
-  ServerURL                string
+	ServerURL                string
 	DataDir                  string
 	NodeIP                   string
 	NodeName                 string

scripts/ci

@@ -3,7 +3,8 @@ set -e
 
 cd $(dirname $0)
 
-if [ -z "SKIP_VALIDATE" ]; then
+./download
+if [ -z "$SKIP_VALIDATE" ]; then
     ./validate
 fi
 ./build

scripts/package-cli

@@ -5,8 +5,6 @@ source $(dirname $0)/version.sh
 
 cd $(dirname $0)/..
 
-./scripts/download
-
 rm -rf bin/crictl bin/kubectl bin/k3s-agent bin/k3s-server bin/kubectl bin/k3s build/data
 ln -s containerd bin/k3s-agent
 ln -s containerd bin/k3s-server

types/apis/apps/v1/zz_generated_deployment_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/apps/v1"
+	"k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/apps/v1"
+	"k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/batch/v1/zz_generated_job_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/batch/v1"
+	"k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/batch/v1"
+	"k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/core/v1/zz_generated_config_map_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/core/v1/zz_generated_endpoints_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/core/v1/zz_generated_node_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/core/v1/zz_generated_node_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/core/v1/zz_generated_pod_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/core/v1/zz_generated_service_account_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/core/v1/zz_generated_service_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/core/v1/zz_generated_service_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/objectclient"
-	v1 "k8s.io/api/rbac/v1"
+	"k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go

@@ -2,7 +2,7 @@ package v1
 
 import (
 	"github.com/rancher/norman/lifecycle"
-	v1 "k8s.io/api/rbac/v1"
+	"k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )