k3s-io
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #260 from erikwilson/fix-validation 

Re-enable build validation
pull/264/head
Darren Shepherd 2019-03-25 09:39:27 -07:00 committed by GitHub
parent 08afcfdc45 7b442b0c3b
commit 4e15845106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/ci
View File

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

2
scripts/package-cli
View File

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

2
types/apis/apps/v1/zz_generated_deployment_controller.go
View File

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

2
types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go
View File

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

2
types/apis/batch/v1/zz_generated_job_controller.go
View File

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

2
types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go
View File

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

2
types/apis/core/v1/zz_generated_config_map_controller.go
View File

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

2
types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go
View File

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

2
types/apis/core/v1/zz_generated_endpoints_controller.go
View File

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

2
types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go
View File

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

2
types/apis/core/v1/zz_generated_node_controller.go
View File

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

2
types/apis/core/v1/zz_generated_node_lifecycle_adapter.go
View File

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

2
types/apis/core/v1/zz_generated_pod_controller.go
View File

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

2
types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go
View File

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

2
types/apis/core/v1/zz_generated_service_account_controller.go
View File

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

2
types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go
View File

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

2
types/apis/core/v1/zz_generated_service_controller.go
View File

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

2
types/apis/core/v1/zz_generated_service_lifecycle_adapter.go
View File

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

2
types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go
View File

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

2
types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go
View File

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