diff --git a/.github/workflows/latest-build.yaml b/.github/workflows/latest-build.yaml index 84396c21..fe093fd3 100644 --- a/.github/workflows/latest-build.yaml +++ b/.github/workflows/latest-build.yaml @@ -35,4 +35,4 @@ jobs: - name: build and publish image run: | export KO_DOCKER_REPO=public.ecr.aws/cloudpilotai/alibabacloud/karpenter - ko build --bare github.com/cloudpilot-ai/karpenter-provider-alicloud/cmd/controller + ko build --bare github.com/cloudpilot-ai/karpenter-provider-alibabacloud/cmd/controller diff --git a/.golangci.yaml b/.golangci.yaml index 48cdadce..9b523429 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -43,7 +43,7 @@ linters-settings: locale: US ignore-words: [] goimports: - local-prefixes: github.com/cloudpilot-ai/karpenter-provider-alicloud + local-prefixes: github.com/cloudpilot-ai/karpenter-provider-alibabacloud gci: sections: - standard # Standard section: captures all standard packages. diff --git a/Makefile b/Makefile index 83baf1ac..82b37a09 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ verify: ## Verify code. Includes linting, formatting, etc golangci-lint run image: ## Build the Karpenter controller images using ko build - $(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="$(KO_DOCKER_REPO)" ko build --bare github.com/cloudpilot-ai/karpenter-provider-alicloud/cmd/controller)) + $(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KOCACHE=$(KOCACHE) KO_DOCKER_REPO="$(KO_DOCKER_REPO)" ko build --bare github.com/cloudpilot-ai/karpenter-provider-alibabacloud/cmd/controller)) $(eval IMG_REPOSITORY=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 1 | cut -d ":" -f 1)) $(eval IMG_TAG=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 1 | cut -d ":" -f 2 -s)) $(eval IMG_DIGEST=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 2)) diff --git a/README.md b/README.md index eb0fc781..8335f500 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -![GitHub stars](https://img.shields.io/github/stars/cloudpilot-ai/karpenter-provider-alicloud) -![GitHub forks](https://img.shields.io/github/forks/cloudpilot-ai/karpenter-provider-alicloud) -[![GitHub License](https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg)](https://github.com/cloudpilot-ai/karpenter-provider-alicloud/blob/main/LICENSE) -[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cloudpilot-ai/karpenter-provider-alicloud/issues) +![GitHub stars](https://img.shields.io/github/stars/cloudpilot-ai/karpenter-provider-alibabacloud) +![GitHub forks](https://img.shields.io/github/forks/cloudpilot-ai/karpenter-provider-alibabacloud) +[![GitHub License](https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg)](https://github.com/cloudpilot-ai/karpenter-provider-alibabacloud/blob/main/LICENSE) +[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cloudpilot-ai/karpenter-provider-alibabacloud/issues)

diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 7056d055..8db8f42b 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -22,9 +22,9 @@ import ( corecontrollers "sigs.k8s.io/karpenter/pkg/controllers" coreoperator "sigs.k8s.io/karpenter/pkg/operator" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/cloudprovider" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/operator" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cloudprovider" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/operator" ) func main() { diff --git a/config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml b/config/components/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml similarity index 99% rename from config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml rename to config/components/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml index ca4abcce..5c832cac 100644 --- a/config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml +++ b/config/components/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - name: ecsnodeclasses.karpenter.k8s.alicloud + name: ecsnodeclasses.karpenter.k8s.alibabacloud spec: - group: karpenter.k8s.alicloud + group: karpenter.k8s.alibabacloud names: categories: - karpenter diff --git a/examples/nodepool/ecsnodeclass.yaml b/examples/nodepool/ecsnodeclass.yaml index 138dcc91..b1a991ad 100644 --- a/examples/nodepool/ecsnodeclass.yaml +++ b/examples/nodepool/ecsnodeclass.yaml @@ -1,4 +1,4 @@ -apiVersion: karpenter.k8s.alicloud/v1alpha1 +apiVersion: karpenter.k8s.alibabacloud/v1alpha1 kind: ECSNodeClass metadata: name: defaultnodeclass diff --git a/go.mod b/go.mod index 601004bb..83bd5276 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cloudpilot-ai/karpenter-provider-alicloud +module github.com/cloudpilot-ai/karpenter-provider-alibabacloud go 1.23 diff --git a/hack/update-generated.sh b/hack/update-generated.sh index 998318db..fa3f1766 100755 --- a/hack/update-generated.sh +++ b/hack/update-generated.sh @@ -15,7 +15,7 @@ cleanup() { } trap "cleanup" EXIT SIGINT -KARPENTER_GO_PACKAGE="github.com/cloudpilot-ai/karpenter-provider-alicloud" +KARPENTER_GO_PACKAGE="github.com/cloudpilot-ai/karpenter-provider-alibabacloud" GO_PKG_DIR=$(dirname "${GOPATH}/src/${KARPENTER_GO_PACKAGE}") mkdir -p "${GO_PKG_DIR}" @@ -26,4 +26,4 @@ fi deepcopy-gen \ --go-header-file hack/boilerplate.go.txt \ --output-file-base zz_generated.deepcopy \ - --input-dirs github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1 + --input-dirs github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1 diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go index 7e16b1c1..04b36335 100644 --- a/pkg/apis/apis.go +++ b/pkg/apis/apis.go @@ -22,7 +22,7 @@ import ( ) var ( - Group = "karpenter.k8s.alicloud" + Group = "karpenter.k8s.alibabacloud" CompatibilityGroup = "compatibility." + Group CRDs = apis.CRDs // object.Unmarshal[apiextensionsv1.CustomResourceDefinition](crds.ECSNodeClassCRD) ) diff --git a/pkg/apis/v1alpha1/doc.go b/pkg/apis/v1alpha1/doc.go index 2f2f9c45..78236896 100644 --- a/pkg/apis/v1alpha1/doc.go +++ b/pkg/apis/v1alpha1/doc.go @@ -16,7 +16,7 @@ limitations under the License. // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +groupName=karpenter.k8s.alicloud +// +groupName=karpenter.k8s.alibabacloud package v1alpha1 import ( @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/scheme" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis" ) func init() { diff --git a/pkg/apis/v1alpha1/labels.go b/pkg/apis/v1alpha1/labels.go index ffb6f076..5cc19eed 100644 --- a/pkg/apis/v1alpha1/labels.go +++ b/pkg/apis/v1alpha1/labels.go @@ -25,7 +25,7 @@ import ( coreapis "sigs.k8s.io/karpenter/pkg/apis" karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis" ) func init() { diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index 3ff11b26..c6b7b9ed 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -40,12 +40,12 @@ import ( "sigs.k8s.io/karpenter/pkg/scheduling" "sigs.k8s.io/karpenter/pkg/utils/resources" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - cloudproviderevents "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/cloudprovider/events" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instancetype" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + cloudproviderevents "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cloudprovider/events" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instance" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instancetype" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils" ) const CloudProviderName = "alibabacloud" diff --git a/pkg/cloudprovider/drift.go b/pkg/cloudprovider/drift.go index 4f2d5be1..608e7f02 100644 --- a/pkg/cloudprovider/drift.go +++ b/pkg/cloudprovider/drift.go @@ -25,9 +25,9 @@ import ( karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1" "sigs.k8s.io/karpenter/pkg/cloudprovider" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instance" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils" ) const ( diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go index 1ce14d7f..3d2f4039 100644 --- a/pkg/controllers/controllers.go +++ b/pkg/controllers/controllers.go @@ -26,22 +26,22 @@ import ( "sigs.k8s.io/karpenter/pkg/cloudprovider" "sigs.k8s.io/karpenter/pkg/events" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/cache" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/interruption" - nodeclaimgarbagecollection "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/nodeclaim/garbagecollection" - nodeclaimtagging "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/nodeclaim/tagging" - nodeclasshash "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/nodeclass/hash" - nodeclaasstatus "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/nodeclass/status" - nodeclasstermination "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/nodeclass/termination" - providersinstancetype "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/providers/instancetype" - controllerspricing "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/providers/pricing" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/operator/options" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instancetype" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/pricing" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/securitygroup" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cache" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/interruption" + nodeclaimgarbagecollection "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/nodeclaim/garbagecollection" + nodeclaimtagging "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/nodeclaim/tagging" + nodeclasshash "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/nodeclass/hash" + nodeclaasstatus "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/nodeclass/status" + nodeclasstermination "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/nodeclass/termination" + providersinstancetype "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/providers/instancetype" + controllerspricing "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/providers/pricing" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/operator/options" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/imagefamily" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instance" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instancetype" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/pricing" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/securitygroup" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/vswitch" ) func NewControllers(ctx context.Context, mgr manager.Manager, clk clock.Clock, diff --git a/pkg/controllers/interruption/controller.go b/pkg/controllers/interruption/controller.go index 9a0fd8d2..575bd45d 100644 --- a/pkg/controllers/interruption/controller.go +++ b/pkg/controllers/interruption/controller.go @@ -32,8 +32,8 @@ import ( karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1" "sigs.k8s.io/karpenter/pkg/events" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/cache" - interruptionevents "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/controllers/interruption/events" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cache" + interruptionevents "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/controllers/interruption/events" ) const ( diff --git a/pkg/controllers/nodeclaim/garbagecollection/controller.go b/pkg/controllers/nodeclaim/garbagecollection/controller.go index f5bd671a..892d9853 100644 --- a/pkg/controllers/nodeclaim/garbagecollection/controller.go +++ b/pkg/controllers/nodeclaim/garbagecollection/controller.go @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/karpenter/pkg/cloudprovider" "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instance" ) type Controller struct { diff --git a/pkg/controllers/nodeclaim/tagging/controller.go b/pkg/controllers/nodeclaim/tagging/controller.go index 4f1761b6..29223e41 100644 --- a/pkg/controllers/nodeclaim/tagging/controller.go +++ b/pkg/controllers/nodeclaim/tagging/controller.go @@ -35,10 +35,10 @@ import ( "sigs.k8s.io/karpenter/pkg/cloudprovider" "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/operator/options" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/operator/options" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instance" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils" ) type Controller struct { diff --git a/pkg/controllers/nodeclass/hash/controller.go b/pkg/controllers/nodeclass/hash/controller.go index c8a89464..c38035ed 100644 --- a/pkg/controllers/nodeclass/hash/controller.go +++ b/pkg/controllers/nodeclass/hash/controller.go @@ -31,7 +31,7 @@ import ( karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1" "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) type Controller struct { diff --git a/pkg/controllers/nodeclass/status/controller.go b/pkg/controllers/nodeclass/status/controller.go index 1d96c99a..19feccf0 100644 --- a/pkg/controllers/nodeclass/status/controller.go +++ b/pkg/controllers/nodeclass/status/controller.go @@ -32,10 +32,10 @@ import ( "sigs.k8s.io/karpenter/pkg/operator/injection" "sigs.k8s.io/karpenter/pkg/utils/result" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/securitygroup" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/imagefamily" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/securitygroup" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/vswitch" ) type nodeClassStatusReconciler interface { diff --git a/pkg/controllers/nodeclass/status/image.go b/pkg/controllers/nodeclass/status/image.go index e1a30290..7b926cfb 100644 --- a/pkg/controllers/nodeclass/status/image.go +++ b/pkg/controllers/nodeclass/status/image.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/imagefamily" ) type Image struct { diff --git a/pkg/controllers/nodeclass/status/securitygroup.go b/pkg/controllers/nodeclass/status/securitygroup.go index ab41b071..849dcd8c 100644 --- a/pkg/controllers/nodeclass/status/securitygroup.go +++ b/pkg/controllers/nodeclass/status/securitygroup.go @@ -26,8 +26,8 @@ import ( "github.com/samber/lo" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/securitygroup" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/securitygroup" ) type SecurityGroup struct { diff --git a/pkg/controllers/nodeclass/status/vswitch.go b/pkg/controllers/nodeclass/status/vswitch.go index fee4dad0..c10a153d 100644 --- a/pkg/controllers/nodeclass/status/vswitch.go +++ b/pkg/controllers/nodeclass/status/vswitch.go @@ -26,8 +26,8 @@ import ( "github.com/samber/lo" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/vswitch" ) type VSwitch struct { diff --git a/pkg/controllers/nodeclass/termination/controller.go b/pkg/controllers/nodeclass/termination/controller.go index aea3c686..831e0425 100644 --- a/pkg/controllers/nodeclass/termination/controller.go +++ b/pkg/controllers/nodeclass/termination/controller.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/karpenter/pkg/events" "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) type Controller struct { diff --git a/pkg/controllers/nodeclass/termination/events.go b/pkg/controllers/nodeclass/termination/events.go index 03d2cc96..e6773798 100644 --- a/pkg/controllers/nodeclass/termination/events.go +++ b/pkg/controllers/nodeclass/termination/events.go @@ -22,8 +22,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/karpenter/pkg/events" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils" ) func WaitingOnNodeClaimTerminationEvent(nodeClass *v1alpha1.ECSNodeClass, names []string) events.Event { diff --git a/pkg/controllers/providers/instancetype/instancetype.go b/pkg/controllers/providers/instancetype/instancetype.go index dc9e2f7c..a58b6afa 100644 --- a/pkg/controllers/providers/instancetype/instancetype.go +++ b/pkg/controllers/providers/instancetype/instancetype.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instancetype" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instancetype" ) type Controller struct { diff --git a/pkg/controllers/providers/pricing/controllers.go b/pkg/controllers/providers/pricing/controllers.go index c014184b..1aa0a33d 100644 --- a/pkg/controllers/providers/pricing/controllers.go +++ b/pkg/controllers/providers/pricing/controllers.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/karpenter/pkg/operator/injection" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/pricing" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/pricing" ) type Controller struct { diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 2d62309d..0aaf0fef 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -27,17 +27,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/karpenter/pkg/operator" - alicache "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/cache" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/operator/options" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/ack" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instance" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/instancetype" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/pricing" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/securitygroup" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/version" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils/client" + alicache "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cache" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/operator/options" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/ack" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/imagefamily" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instance" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/instancetype" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/pricing" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/securitygroup" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/version" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/vswitch" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils/client" ) // Operator is injected into the AliCloud CloudProvider's factories diff --git a/pkg/operator/options/options.go b/pkg/operator/options/options.go index 62eced0f..53e84c15 100644 --- a/pkg/operator/options/options.go +++ b/pkg/operator/options/options.go @@ -26,7 +26,7 @@ import ( coreoptions "sigs.k8s.io/karpenter/pkg/operator/options" "sigs.k8s.io/karpenter/pkg/utils/env" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils" ) func init() { diff --git a/pkg/providers/ack/ack.go b/pkg/providers/ack/ack.go index 8172bb9e..5377cb2b 100644 --- a/pkg/providers/ack/ack.go +++ b/pkg/providers/ack/ack.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) type Provider interface { diff --git a/pkg/providers/ack/ack_test.go b/pkg/providers/ack/ack_test.go index 85b451ea..5ea4242b 100644 --- a/pkg/providers/ack/ack_test.go +++ b/pkg/providers/ack/ack_test.go @@ -22,7 +22,7 @@ import ( "github.com/alibabacloud-go/tea/tea" "github.com/stretchr/testify/assert" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) func Test_convertNodeClassKubeletConfigToACKNodeConfig(t *testing.T) { diff --git a/pkg/providers/imagefamily/image.go b/pkg/providers/imagefamily/image.go index f3945c1a..3ed9822a 100644 --- a/pkg/providers/imagefamily/image.go +++ b/pkg/providers/imagefamily/image.go @@ -31,8 +31,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/karpenter/pkg/scheduling" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/version" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/version" ) type Provider interface { diff --git a/pkg/providers/imagefamily/resolver.go b/pkg/providers/imagefamily/resolver.go index 47a36078..694064e0 100644 --- a/pkg/providers/imagefamily/resolver.go +++ b/pkg/providers/imagefamily/resolver.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/karpenter/pkg/cloudprovider" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) var DefaultSystemDisk = v1alpha1.SystemDisk{ diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go index c253c2ad..c97f1301 100644 --- a/pkg/providers/instance/instance.go +++ b/pkg/providers/instance/instance.go @@ -35,12 +35,12 @@ import ( "sigs.k8s.io/karpenter/pkg/scheduling" "sigs.k8s.io/karpenter/pkg/utils/resources" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/operator/options" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/ack" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils/alierrors" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/operator/options" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/ack" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/imagefamily" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/vswitch" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils/alierrors" ) const ( diff --git a/pkg/providers/instance/types.go b/pkg/providers/instance/types.go index f4c71a90..d238ad39 100644 --- a/pkg/providers/instance/types.go +++ b/pkg/providers/instance/types.go @@ -25,7 +25,7 @@ import ( "github.com/samber/lo" "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils" ) const ( diff --git a/pkg/providers/instancetype/instancetype.go b/pkg/providers/instancetype/instancetype.go index ce8d5427..2caf0778 100644 --- a/pkg/providers/instancetype/instancetype.go +++ b/pkg/providers/instancetype/instancetype.go @@ -38,10 +38,10 @@ import ( "sigs.k8s.io/karpenter/pkg/scheduling" "sigs.k8s.io/karpenter/pkg/utils/pretty" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - kcache "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/cache" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/pricing" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/vswitch" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + kcache "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/cache" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/pricing" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/vswitch" ) type Provider interface { diff --git a/pkg/providers/instancetype/types.go b/pkg/providers/instancetype/types.go index 438a2625..bb2043ce 100644 --- a/pkg/providers/instancetype/types.go +++ b/pkg/providers/instancetype/types.go @@ -34,9 +34,9 @@ import ( "sigs.k8s.io/karpenter/pkg/scheduling" "sigs.k8s.io/karpenter/pkg/utils/resources" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/operator/options" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/providers/imagefamily" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/operator/options" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/providers/imagefamily" ) var ( diff --git a/pkg/providers/pricing/pricing.go b/pkg/providers/pricing/pricing.go index 41a6b2c6..90f55648 100644 --- a/pkg/providers/pricing/pricing.go +++ b/pkg/providers/pricing/pricing.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/karpenter/pkg/utils/pretty" - utilsobject "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/utils/object" + utilsobject "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/utils/object" ) //go:embed initial-on-demand-prices.json diff --git a/pkg/providers/securitygroup/securitygroup.go b/pkg/providers/securitygroup/securitygroup.go index b8a286bd..57db8815 100644 --- a/pkg/providers/securitygroup/securitygroup.go +++ b/pkg/providers/securitygroup/securitygroup.go @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/karpenter/pkg/utils/pretty" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) type Provider interface { diff --git a/pkg/providers/vswitch/vswitch.go b/pkg/providers/vswitch/vswitch.go index b3b5d8a8..bef8802d 100644 --- a/pkg/providers/vswitch/vswitch.go +++ b/pkg/providers/vswitch/vswitch.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/karpenter/pkg/scheduling" "sigs.k8s.io/karpenter/pkg/utils/pretty" - "github.com/cloudpilot-ai/karpenter-provider-alicloud/pkg/apis/v1alpha1" + "github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pkg/apis/v1alpha1" ) type Provider interface { diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 2fb84cb3..f7dab3fa 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/karpenter/pkg/cloudprovider" ) -// alibabacloud ack node spec providerID format, ref: https://github.com/cloudpilot-ai/karpenter-provider-alicloud/pull/35#discussion_r1794805184 +// alibabacloud ack node spec providerID format, ref: https://github.com/cloudpilot-ai/karpenter-provider-alibabacloud/pull/35#discussion_r1794805184 // eg: cn-zhangjiakou.i-xxxx var instanceIDRegex = regexp.MustCompile(`(?P.*)\.(?P.*)`)