[AlibabaCloud] Change alicloud to alibabacloud (#470)
This commit is contained in:
2
Makefile
2
Makefile
@@ -123,7 +123,7 @@ format: $(GOPATH)/bin/goimports
|
|||||||
.PHONY: skaffold
|
.PHONY: skaffold
|
||||||
skaffold: MODE ?= dev
|
skaffold: MODE ?= dev
|
||||||
skaffold: PROFILE := local
|
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:
|
skaffold:
|
||||||
@if [[ ! "minikube,docker-for-desktop" =~ .*"$(kubectl_context)".* ]]; then \
|
@if [[ ! "minikube,docker-for-desktop" =~ .*"$(kubectl_context)".* ]]; then \
|
||||||
echo current-context is [$(kubectl_context)]. Must be one of [minikube,docker-for-desktop]; false; \
|
echo current-context is [$(kubectl_context)]. Must be one of [minikube,docker-for-desktop]; false; \
|
||||||
|
|||||||
@@ -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.
|
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
|
#### Configuration File
|
||||||
|
|
||||||
The alibaba ECI provider will read configuration file specified by the `--provider-config` flag.
|
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
|
### Azure Container Instances Provider
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export ECI_VSWITCH=vsw-123
|
|||||||
export ECI_ACCESS_KEY=123
|
export ECI_ACCESS_KEY=123
|
||||||
export ECI_SECRET_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
|
confirm the virtual kubelet is connected to k8s cluster
|
||||||
```
|
```
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package alicloud
|
package alibabacloud
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package alicloud
|
package alibabacloud
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@@ -19,7 +19,7 @@ import (
|
|||||||
"github.com/cpuguy83/strongerrors"
|
"github.com/cpuguy83/strongerrors"
|
||||||
"github.com/virtual-kubelet/virtual-kubelet/log"
|
"github.com/virtual-kubelet/virtual-kubelet/log"
|
||||||
"github.com/virtual-kubelet/virtual-kubelet/manager"
|
"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"
|
"k8s.io/api/core/v1"
|
||||||
k8serr "k8s.io/apimachinery/pkg/api/errors"
|
k8serr "k8s.io/apimachinery/pkg/api/errors"
|
||||||
"k8s.io/apimachinery/pkg/api/resource"
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
|
Before Width: | Height: | Size: 878 B After Width: | Height: | Size: 878 B |
@@ -1,4 +1,4 @@
|
|||||||
package alicloud
|
package alibabacloud
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -1,18 +1,18 @@
|
|||||||
// +build !no_alicloud_provider
|
// +build !no_alibabacloud_provider
|
||||||
|
|
||||||
package register
|
package register
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/virtual-kubelet/virtual-kubelet/providers"
|
"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() {
|
func init() {
|
||||||
register("alicloud", aliCloudInit)
|
register("alibabacloud", aliCloudInit)
|
||||||
}
|
}
|
||||||
|
|
||||||
func aliCloudInit(cfg InitConfig) (providers.Provider, error) {
|
func aliCloudInit(cfg InitConfig) (providers.Provider, error) {
|
||||||
return alicloud.NewECIProvider(
|
return alibabacloud.NewECIProvider(
|
||||||
cfg.ConfigPath,
|
cfg.ConfigPath,
|
||||||
cfg.ResourceManager,
|
cfg.ResourceManager,
|
||||||
cfg.NodeName,
|
cfg.NodeName,
|
||||||
|
|||||||
Reference in New Issue
Block a user