From e5c3d0104c7bd8540111705c81259079f738522e Mon Sep 17 00:00:00 2001 From: muya-zj <45938993+muya-zj@users.noreply.github.com> Date: Wed, 26 Dec 2018 22:42:56 +0800 Subject: [PATCH] [AlibabaCloud] Change alicloud to alibabacloud (#470) --- Makefile | 2 +- README.md | 4 ++-- providers/{alicloud => alibabacloud}/README.md | 2 +- providers/{alicloud => alibabacloud}/config.go | 2 +- providers/{alicloud => alibabacloud}/eci.go | 4 ++-- providers/{alicloud => alibabacloud}/eci.svg | 0 providers/{alicloud => alibabacloud}/eci.toml | 0 providers/{alicloud => alibabacloud}/eci/client.go | 0 .../eci/create_container_group.go | 0 .../eci/delete_container_group.go | 0 .../eci/describe_container_groups.go | 0 .../eci/describe_container_log.go | 0 .../eci/struct_config_file_to_path.go | 0 .../{alicloud => alibabacloud}/eci/struct_container.go | 0 .../eci/struct_container_group.go | 0 .../eci/struct_container_port.go | 0 .../eci/struct_container_state.go | 0 .../eci/struct_environment_var.go | 0 providers/{alicloud => alibabacloud}/eci/struct_event.go | 0 providers/{alicloud => alibabacloud}/eci/struct_tag.go | 0 providers/{alicloud => alibabacloud}/eci/struct_volume.go | 0 .../{alicloud => alibabacloud}/eci/struct_volume_mount.go | 0 providers/{alicloud => alibabacloud}/errors.go | 2 +- providers/register/provider_alicloud.go | 8 ++++---- 24 files changed, 12 insertions(+), 12 deletions(-) rename providers/{alicloud => alibabacloud}/README.md (99%) rename providers/{alicloud => alibabacloud}/config.go (98%) rename providers/{alicloud => alibabacloud}/eci.go (99%) rename providers/{alicloud => alibabacloud}/eci.svg (100%) rename providers/{alicloud => alibabacloud}/eci.toml (100%) rename providers/{alicloud => alibabacloud}/eci/client.go (100%) rename providers/{alicloud => alibabacloud}/eci/create_container_group.go (100%) rename providers/{alicloud => alibabacloud}/eci/delete_container_group.go (100%) rename providers/{alicloud => alibabacloud}/eci/describe_container_groups.go (100%) rename providers/{alicloud => alibabacloud}/eci/describe_container_log.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_config_file_to_path.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_container.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_container_group.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_container_port.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_container_state.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_environment_var.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_event.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_tag.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_volume.go (100%) rename providers/{alicloud => alibabacloud}/eci/struct_volume_mount.go (100%) rename providers/{alicloud => alibabacloud}/errors.go (94%) diff --git a/Makefile b/Makefile index 981b7c920..10625e316 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ format: $(GOPATH)/bin/goimports .PHONY: skaffold skaffold: MODE ?= dev skaffold: PROFILE := local -skaffold: VK_BUILD_TAGS ?= no_alicloud_provider no_aws_provider no_azure_provider no_azurebatch_provider no_cri_provider no_huawei_provider no_hyper_provider no_vic_provider no_web_provider +skaffold: VK_BUILD_TAGS ?= no_alibabacloud_provider no_aws_provider no_azure_provider no_azurebatch_provider no_cri_provider no_huawei_provider no_hyper_provider no_vic_provider no_web_provider skaffold: @if [[ ! "minikube,docker-for-desktop" =~ .*"$(kubectl_context)".* ]]; then \ echo current-context is [$(kubectl_context)]. Must be one of [minikube,docker-for-desktop]; false; \ diff --git a/README.md b/README.md index ff3b852a7..ae16b50f6 100644 --- a/README.md +++ b/README.md @@ -139,13 +139,13 @@ Providers must provide the following functionality to be considered a supported Alibaba Cloud ECI(Elastic Container Instance) is a service that allow you run containers without having to manage servers or clusters. -You can find more details in the [Alibaba Cloud ECI provider documentation](./providers/alicloud/README.md). +You can find more details in the [Alibaba Cloud ECI provider documentation](./providers/alibabacloud/README.md). #### Configuration File The alibaba ECI provider will read configuration file specified by the `--provider-config` flag. -The example configure file is `providers/alicloud/eci.toml`. +The example configure file is `providers/alibabacloud/eci.toml`. ### Azure Container Instances Provider diff --git a/providers/alicloud/README.md b/providers/alibabacloud/README.md similarity index 99% rename from providers/alicloud/README.md rename to providers/alibabacloud/README.md index 6d0796bc5..c052d5e78 100644 --- a/providers/alicloud/README.md +++ b/providers/alibabacloud/README.md @@ -21,7 +21,7 @@ export ECI_VSWITCH=vsw-123 export ECI_ACCESS_KEY=123 export ECI_SECRET_KEY=123 -VKUBELET_TAINT_KEY=alibabacloud.com/eci virtual-kubelet --provider alicloud +VKUBELET_TAINT_KEY=alibabacloud.com/eci virtual-kubelet --provider alibabacloud ``` confirm the virtual kubelet is connected to k8s cluster ``` diff --git a/providers/alicloud/config.go b/providers/alibabacloud/config.go similarity index 98% rename from providers/alicloud/config.go rename to providers/alibabacloud/config.go index 92c26d709..e2de7940c 100644 --- a/providers/alicloud/config.go +++ b/providers/alibabacloud/config.go @@ -1,4 +1,4 @@ -package alicloud +package alibabacloud import ( "io" diff --git a/providers/alicloud/eci.go b/providers/alibabacloud/eci.go similarity index 99% rename from providers/alicloud/eci.go rename to providers/alibabacloud/eci.go index 12ed7eb56..23d68e1ef 100644 --- a/providers/alicloud/eci.go +++ b/providers/alibabacloud/eci.go @@ -1,4 +1,4 @@ -package alicloud +package alibabacloud import ( "bytes" @@ -19,7 +19,7 @@ import ( "github.com/cpuguy83/strongerrors" "github.com/virtual-kubelet/virtual-kubelet/log" "github.com/virtual-kubelet/virtual-kubelet/manager" - "github.com/virtual-kubelet/virtual-kubelet/providers/alicloud/eci" + "github.com/virtual-kubelet/virtual-kubelet/providers/alibabacloud/eci" "k8s.io/api/core/v1" k8serr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/providers/alicloud/eci.svg b/providers/alibabacloud/eci.svg similarity index 100% rename from providers/alicloud/eci.svg rename to providers/alibabacloud/eci.svg diff --git a/providers/alicloud/eci.toml b/providers/alibabacloud/eci.toml similarity index 100% rename from providers/alicloud/eci.toml rename to providers/alibabacloud/eci.toml diff --git a/providers/alicloud/eci/client.go b/providers/alibabacloud/eci/client.go similarity index 100% rename from providers/alicloud/eci/client.go rename to providers/alibabacloud/eci/client.go diff --git a/providers/alicloud/eci/create_container_group.go b/providers/alibabacloud/eci/create_container_group.go similarity index 100% rename from providers/alicloud/eci/create_container_group.go rename to providers/alibabacloud/eci/create_container_group.go diff --git a/providers/alicloud/eci/delete_container_group.go b/providers/alibabacloud/eci/delete_container_group.go similarity index 100% rename from providers/alicloud/eci/delete_container_group.go rename to providers/alibabacloud/eci/delete_container_group.go diff --git a/providers/alicloud/eci/describe_container_groups.go b/providers/alibabacloud/eci/describe_container_groups.go similarity index 100% rename from providers/alicloud/eci/describe_container_groups.go rename to providers/alibabacloud/eci/describe_container_groups.go diff --git a/providers/alicloud/eci/describe_container_log.go b/providers/alibabacloud/eci/describe_container_log.go similarity index 100% rename from providers/alicloud/eci/describe_container_log.go rename to providers/alibabacloud/eci/describe_container_log.go diff --git a/providers/alicloud/eci/struct_config_file_to_path.go b/providers/alibabacloud/eci/struct_config_file_to_path.go similarity index 100% rename from providers/alicloud/eci/struct_config_file_to_path.go rename to providers/alibabacloud/eci/struct_config_file_to_path.go diff --git a/providers/alicloud/eci/struct_container.go b/providers/alibabacloud/eci/struct_container.go similarity index 100% rename from providers/alicloud/eci/struct_container.go rename to providers/alibabacloud/eci/struct_container.go diff --git a/providers/alicloud/eci/struct_container_group.go b/providers/alibabacloud/eci/struct_container_group.go similarity index 100% rename from providers/alicloud/eci/struct_container_group.go rename to providers/alibabacloud/eci/struct_container_group.go diff --git a/providers/alicloud/eci/struct_container_port.go b/providers/alibabacloud/eci/struct_container_port.go similarity index 100% rename from providers/alicloud/eci/struct_container_port.go rename to providers/alibabacloud/eci/struct_container_port.go diff --git a/providers/alicloud/eci/struct_container_state.go b/providers/alibabacloud/eci/struct_container_state.go similarity index 100% rename from providers/alicloud/eci/struct_container_state.go rename to providers/alibabacloud/eci/struct_container_state.go diff --git a/providers/alicloud/eci/struct_environment_var.go b/providers/alibabacloud/eci/struct_environment_var.go similarity index 100% rename from providers/alicloud/eci/struct_environment_var.go rename to providers/alibabacloud/eci/struct_environment_var.go diff --git a/providers/alicloud/eci/struct_event.go b/providers/alibabacloud/eci/struct_event.go similarity index 100% rename from providers/alicloud/eci/struct_event.go rename to providers/alibabacloud/eci/struct_event.go diff --git a/providers/alicloud/eci/struct_tag.go b/providers/alibabacloud/eci/struct_tag.go similarity index 100% rename from providers/alicloud/eci/struct_tag.go rename to providers/alibabacloud/eci/struct_tag.go diff --git a/providers/alicloud/eci/struct_volume.go b/providers/alibabacloud/eci/struct_volume.go similarity index 100% rename from providers/alicloud/eci/struct_volume.go rename to providers/alibabacloud/eci/struct_volume.go diff --git a/providers/alicloud/eci/struct_volume_mount.go b/providers/alibabacloud/eci/struct_volume_mount.go similarity index 100% rename from providers/alicloud/eci/struct_volume_mount.go rename to providers/alibabacloud/eci/struct_volume_mount.go diff --git a/providers/alicloud/errors.go b/providers/alibabacloud/errors.go similarity index 94% rename from providers/alicloud/errors.go rename to providers/alibabacloud/errors.go index f3d9ea23c..97807a4c4 100644 --- a/providers/alicloud/errors.go +++ b/providers/alibabacloud/errors.go @@ -1,4 +1,4 @@ -package alicloud +package alibabacloud import ( "net/http" diff --git a/providers/register/provider_alicloud.go b/providers/register/provider_alicloud.go index b98a71ae2..98d67570f 100644 --- a/providers/register/provider_alicloud.go +++ b/providers/register/provider_alicloud.go @@ -1,18 +1,18 @@ -// +build !no_alicloud_provider +// +build !no_alibabacloud_provider package register import ( "github.com/virtual-kubelet/virtual-kubelet/providers" - "github.com/virtual-kubelet/virtual-kubelet/providers/alicloud" + "github.com/virtual-kubelet/virtual-kubelet/providers/alibabacloud" ) func init() { - register("alicloud", aliCloudInit) + register("alibabacloud", aliCloudInit) } func aliCloudInit(cfg InitConfig) (providers.Provider, error) { - return alicloud.NewECIProvider( + return alibabacloud.NewECIProvider( cfg.ConfigPath, cfg.ResourceManager, cfg.NodeName,