From 5d21064d89e3f750f5d8fc2438922a3540e997c1 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Sun, 24 Mar 2019 12:00:04 -0700 Subject: [PATCH 1/4] Fix build validation --- scripts/ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci b/scripts/ci index 1d12c4c2a1..8ce22ca7c5 100755 --- a/scripts/ci +++ b/scripts/ci @@ -3,7 +3,7 @@ set -e cd $(dirname $0) -if [ -z "SKIP_VALIDATE" ]; then +if [ -z "$SKIP_VALIDATE" ]; then ./validate fi ./build From 4456ad84dba0674010aee789fdc486237a353191 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Sun, 24 Mar 2019 12:12:18 -0700 Subject: [PATCH 2/4] Move build download to ci --- scripts/ci | 1 + scripts/package-cli | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci b/scripts/ci index 8ce22ca7c5..a0de81fdee 100755 --- a/scripts/ci +++ b/scripts/ci @@ -3,6 +3,7 @@ set -e cd $(dirname $0) +./download if [ -z "$SKIP_VALIDATE" ]; then ./validate fi diff --git a/scripts/package-cli b/scripts/package-cli index c7646dc25a..421bbd3666 100755 --- a/scripts/package-cli +++ b/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 From 2768f559c1bb09034bff5d0119a76e82c3d6d5b9 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Sun, 24 Mar 2019 12:19:05 -0700 Subject: [PATCH 3/4] Fix go fmt error --- pkg/cli/cmds/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go index 2b9e7459b6..ebfd5dfbca 100644 --- a/pkg/cli/cmds/agent.go +++ b/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 From 7b442b0c3b8d4b45bf4a46e7d1dc9c21e6ac06b5 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Sun, 24 Mar 2019 13:15:15 -0700 Subject: [PATCH 4/4] Generated data --- types/apis/apps/v1/zz_generated_deployment_controller.go | 2 +- types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go | 2 +- types/apis/batch/v1/zz_generated_job_controller.go | 2 +- types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go | 2 +- types/apis/core/v1/zz_generated_config_map_controller.go | 2 +- types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go | 2 +- types/apis/core/v1/zz_generated_endpoints_controller.go | 2 +- types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go | 2 +- types/apis/core/v1/zz_generated_node_controller.go | 2 +- types/apis/core/v1/zz_generated_node_lifecycle_adapter.go | 2 +- types/apis/core/v1/zz_generated_pod_controller.go | 2 +- types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go | 2 +- types/apis/core/v1/zz_generated_service_account_controller.go | 2 +- .../core/v1/zz_generated_service_account_lifecycle_adapter.go | 2 +- types/apis/core/v1/zz_generated_service_controller.go | 2 +- types/apis/core/v1/zz_generated_service_lifecycle_adapter.go | 2 +- .../v1/zz_generated_cluster_role_binding_controller.go | 2 +- .../v1/zz_generated_cluster_role_binding_lifecycle_adapter.go | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/types/apis/apps/v1/zz_generated_deployment_controller.go b/types/apis/apps/v1/zz_generated_deployment_controller.go index 3ddb52c204..96e33920e2 100644 --- a/types/apis/apps/v1/zz_generated_deployment_controller.go +++ b/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" diff --git a/types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go b/types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go index 152b5058b7..ad33dff50d 100644 --- a/types/apis/apps/v1/zz_generated_deployment_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/batch/v1/zz_generated_job_controller.go b/types/apis/batch/v1/zz_generated_job_controller.go index 886f353b30..a85e65ec88 100644 --- a/types/apis/batch/v1/zz_generated_job_controller.go +++ b/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" diff --git a/types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go b/types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go index 1294f834e0..aeba79f2fe 100644 --- a/types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/core/v1/zz_generated_config_map_controller.go b/types/apis/core/v1/zz_generated_config_map_controller.go index 5cf44e6c58..0c74f97353 100644 --- a/types/apis/core/v1/zz_generated_config_map_controller.go +++ b/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" diff --git a/types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go b/types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go index d707c27dd8..2b46adf9eb 100644 --- a/types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/core/v1/zz_generated_endpoints_controller.go b/types/apis/core/v1/zz_generated_endpoints_controller.go index 7938d46877..7d3d0ae086 100644 --- a/types/apis/core/v1/zz_generated_endpoints_controller.go +++ b/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" diff --git a/types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go b/types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go index f4cfe4817e..9684bfa2cf 100644 --- a/types/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/core/v1/zz_generated_node_controller.go b/types/apis/core/v1/zz_generated_node_controller.go index 031977f018..55579c693a 100644 --- a/types/apis/core/v1/zz_generated_node_controller.go +++ b/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" diff --git a/types/apis/core/v1/zz_generated_node_lifecycle_adapter.go b/types/apis/core/v1/zz_generated_node_lifecycle_adapter.go index 9cd3306a53..7b9488cebb 100644 --- a/types/apis/core/v1/zz_generated_node_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/core/v1/zz_generated_pod_controller.go b/types/apis/core/v1/zz_generated_pod_controller.go index 421678df19..c8bb2c1946 100644 --- a/types/apis/core/v1/zz_generated_pod_controller.go +++ b/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" diff --git a/types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go b/types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go index aa761dedcd..6b2f847524 100644 --- a/types/apis/core/v1/zz_generated_pod_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/core/v1/zz_generated_service_account_controller.go b/types/apis/core/v1/zz_generated_service_account_controller.go index dbeb3bae53..ef1f84e9f6 100644 --- a/types/apis/core/v1/zz_generated_service_account_controller.go +++ b/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" diff --git a/types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go b/types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go index ca281c4fb5..0be5f4bee4 100644 --- a/types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/core/v1/zz_generated_service_controller.go b/types/apis/core/v1/zz_generated_service_controller.go index 36153efab7..d455c53c17 100644 --- a/types/apis/core/v1/zz_generated_service_controller.go +++ b/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" diff --git a/types/apis/core/v1/zz_generated_service_lifecycle_adapter.go b/types/apis/core/v1/zz_generated_service_lifecycle_adapter.go index 37a28afd91..8f8152a135 100644 --- a/types/apis/core/v1/zz_generated_service_lifecycle_adapter.go +++ b/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" ) diff --git a/types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go b/types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go index 636660da63..bd9da87351 100644 --- a/types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go +++ b/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" diff --git a/types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go b/types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go index 07d2b43719..4709ecd506 100644 --- a/types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go +++ b/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" )