diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml index 82e38deda..713aab7bc 100644 --- a/.github/ISSUE_TEMPLATE/bug.yaml +++ b/.github/ISSUE_TEMPLATE/bug.yaml @@ -7,7 +7,7 @@ body: attributes: label: Version description: | - https://github.com/Azure/karpenter/releases + https://github.com/Azure/karpenter-provider-azure/releases value: | __Karpenter Version:__ v0.0.0 diff --git a/.github/workflows/README.md b/.github/workflows/README.md index aca279915..d0e696626 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -10,6 +10,6 @@ ### Running the test case 1. Make a draft PR 2. Anytime you want to run the E2E test suite submit a review comment `/test` -3. Each time a the given review comment is submited it will trigger the [E2EMatrixTrigger](https://github.com/Azure/karpenter/actions/workflows/e2e-matrix-trigger.yaml) workflow which will contain your test suite. +3. Each time a the given review comment is submited it will trigger the [E2EMatrixTrigger](https://github.com/Azure/karpenter-provider-azure/actions/workflows/e2e-matrix-trigger.yaml) workflow which will contain your test suite. \ No newline at end of file diff --git a/.github/workflows/build-publish-mcr.yml b/.github/workflows/build-publish-mcr.yml index 02f5ecbc9..5d2ee309f 100644 --- a/.github/workflows/build-publish-mcr.yml +++ b/.github/workflows/build-publish-mcr.yml @@ -64,7 +64,7 @@ jobs: main: ./cmd/controller flags: ['-tags','ccp'] EOF - ko build github.com/Azure/karpenter/cmd/controller \ + ko build github.com/Azure/karpenter-provider-azure/cmd/controller \ --platform linux/amd64,linux/arm64 \ --base-import-paths \ --sbom none \ diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3d238f4fb..d75a77a94 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -8,7 +8,7 @@ on: jobs: analyze: - if: github.repository == 'Azure/karpenter' + if: github.repository == 'Azure/karpenter-provider-azure' name: Analyze runs-on: ubuntu-latest permissions: diff --git a/.golangci.yaml b/.golangci.yaml index 0d0fff5bd..3974d897b 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -51,7 +51,7 @@ linters-settings: locale: US ignore-words: [karpenter] goimports: - local-prefixes: github.com/azure/karpenter + local-prefixes: github.com/azure/karpenter-provider-azure goheader: template: |- Portions Copyright (c) Microsoft Corporation. diff --git a/.vscode/launch.json b/.vscode/launch.json index 2d6a2a2c0..795302821 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,7 +15,7 @@ // observed variation in mapping ("dlv sources" in DEBUG CONSOLE), reason unknown for now; // sometimes the below is needed, and somtimes not // "substitutePath": [ - // {"from": "${workspaceFolder}", "to": "github.com/Azure/karpenter/"} + // {"from": "${workspaceFolder}", "to": "github.com/Azure/karpenter-provider-azure/"} // {"from": "/go/pkg/mod/", "to": ""} // source mapping for external modules, if needed //], "port": 56268, diff --git a/README.md b/README.md index aca7a8ce3..15ecf95af 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -[![GitHub License](https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg)](https://github.com/Azure/karpenter/blob/main/LICENSE.txt) -[![CI](https://github.com/Azure/karpenter/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Azure/karpenter/actions/workflows/ci.yml) -![GitHub stars](https://img.shields.io/github/stars/Azure/karpenter) -![GitHub forks](https://img.shields.io/github/forks/Azure/karpenter) -[![Go Report Card](https://goreportcard.com/badge/github.com/Azure/karpenter)](https://goreportcard.com/report/github.com/Azure/karpenter) -[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/Azure/karpenter/issues) +[![GitHub License](https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg)](https://github.com/Azure/karpenter-provider-azure/blob/main/LICENSE.txt) +[![CI](https://github.com/Azure/karpenter-provider-azure/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Azure/karpenter-provider-azure/actions/workflows/ci.yml) +![GitHub stars](https://img.shields.io/github/stars/Azure/karpenter-provider-azure) +![GitHub forks](https://img.shields.io/github/forks/Azure/karpenter-provider-azure) +[![Go Report Card](https://goreportcard.com/badge/github.com/Azure/karpenter-provider-azure)](https://goreportcard.com/report/github.com/Azure/karpenter-provider-azure) +[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/Azure/karpenter-provider-azure/issues) --- ## Features Overview diff --git a/charts/karpenter-crd/Chart.yaml b/charts/karpenter-crd/Chart.yaml index dcef507eb..77e1cfd4b 100644 --- a/charts/karpenter-crd/Chart.yaml +++ b/charts/karpenter-crd/Chart.yaml @@ -10,7 +10,7 @@ keywords: - scheduler - autoscaling - lifecycle -home: https://github.com/Azure/karpenter/ +home: https://github.com/Azure/karpenter-provider-azure/ icon: https://repository-images.githubusercontent.com/278480393/dab059c8-caa1-4b55-aaa7-3d30e47a5616 sources: - - https://github.com/Azure/karpenter/ + - https://github.com/Azure/karpenter-provider-azure/ diff --git a/charts/karpenter/Chart.yaml b/charts/karpenter/Chart.yaml index e1202578d..71c19ae8e 100644 --- a/charts/karpenter/Chart.yaml +++ b/charts/karpenter/Chart.yaml @@ -10,7 +10,7 @@ keywords: - scheduler - autoscaling - lifecycle -home: https://github.com/Azure/karpenter/ +home: https://github.com/Azure/karpenter-provider-azure/ icon: https://repository-images.githubusercontent.com/278480393/dab059c8-caa1-4b55-aaa7-3d30e47a5616 sources: - - https://github.com/Azure/karpenter/ + - https://github.com/Azure/karpenter-provider-azure/ diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 1d31fa701..7b3df0a12 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -21,11 +21,11 @@ package main import ( "github.com/samber/lo" - "github.com/Azure/karpenter/pkg/cloudprovider" - "github.com/Azure/karpenter/pkg/operator" - "github.com/Azure/karpenter/pkg/webhooks" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" + "github.com/Azure/karpenter-provider-azure/pkg/operator" + "github.com/Azure/karpenter-provider-azure/pkg/webhooks" - controllers "github.com/Azure/karpenter/pkg/controllers" + controllers "github.com/Azure/karpenter-provider-azure/pkg/controllers" "github.com/aws/karpenter-core/pkg/cloudprovider/metrics" corecontrollers "github.com/aws/karpenter-core/pkg/controllers" "github.com/aws/karpenter-core/pkg/controllers/state" diff --git a/cmd/controller/main_ccp.go b/cmd/controller/main_ccp.go index e04f1df9d..391c34604 100644 --- a/cmd/controller/main_ccp.go +++ b/cmd/controller/main_ccp.go @@ -21,11 +21,11 @@ package main import ( "github.com/samber/lo" - "github.com/Azure/karpenter/pkg/cloudprovider" - "github.com/Azure/karpenter/pkg/operator" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" + "github.com/Azure/karpenter-provider-azure/pkg/operator" - altOperator "github.com/Azure/karpenter/pkg/alt/karpenter-core/pkg/operator" - controllers "github.com/Azure/karpenter/pkg/controllers" + altOperator "github.com/Azure/karpenter-provider-azure/pkg/alt/karpenter-core/pkg/operator" + controllers "github.com/Azure/karpenter-provider-azure/pkg/controllers" "github.com/aws/karpenter-core/pkg/cloudprovider/metrics" corecontrollers "github.com/aws/karpenter-core/pkg/controllers" diff --git a/designs/k8s-node-image-upgrade.md b/designs/k8s-node-image-upgrade.md index 019a652ac..5976084d2 100644 --- a/designs/k8s-node-image-upgrade.md +++ b/designs/k8s-node-image-upgrade.md @@ -286,9 +286,6 @@ https://github.com/aws/karpenter/issues/1738 - Drift Max Surge design within `karpenter-core`:
https://github.com/aws/karpenter-core/pull/516#pullrequestreview-1636663551 -- POC PR for drift supporting k8s version upgrade:
-https://github.com/Azure/karpenter/pull/262 - --- From template: diff --git a/go.mod b/go.mod index 2d5f5f78c..661e707f9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Azure/karpenter +module github.com/Azure/karpenter-provider-azure go 1.21 diff --git a/hack/code/prices_gen.go b/hack/code/prices_gen.go index 8cd9ac481..0ddd53d8d 100644 --- a/hack/code/prices_gen.go +++ b/hack/code/prices_gen.go @@ -29,7 +29,7 @@ import ( "sort" "time" - "github.com/Azure/karpenter/pkg/providers/pricing" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing" "github.com/samber/lo" ) @@ -179,8 +179,7 @@ func writePricing(src *bytes.Buffer, instanceNames []string, region string, getP continue } - // TODO: look at grouping by families to make the generated output nicer: - // https://github.com/Azure/karpenter/pull/94#discussion_r1120901524 + // TODO: look at grouping by families to make the generated output nicer _, err := fmt.Fprintf(src, "\"%s\":%f, \n", instanceName, price) if err != nil { log.Fatalf("error writing, %s", err) diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go index 68014ec31..04e4ae7fa 100644 --- a/pkg/apis/apis.go +++ b/pkg/apis/apis.go @@ -27,8 +27,8 @@ import ( "github.com/samber/lo" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" "github.com/aws/karpenter-core/pkg/apis" coresettings "github.com/aws/karpenter-core/pkg/apis/settings" "github.com/aws/karpenter-core/pkg/utils/functional" diff --git a/pkg/apis/settings/suite_test.go b/pkg/apis/settings/suite_test.go index 94aa48e27..07c0f6433 100644 --- a/pkg/apis/settings/suite_test.go +++ b/pkg/apis/settings/suite_test.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/api/core/v1" . "knative.dev/pkg/logging/testing" - "github.com/Azure/karpenter/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" ) var ctx context.Context diff --git a/pkg/apis/v1alpha2/nodepool_validation_cel_test.go b/pkg/apis/v1alpha2/nodepool_validation_cel_test.go index 71aed05be..5b783bd7e 100644 --- a/pkg/apis/v1alpha2/nodepool_validation_cel_test.go +++ b/pkg/apis/v1alpha2/nodepool_validation_cel_test.go @@ -19,7 +19,7 @@ package v1alpha2_test import ( "strings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" "github.com/Pallinder/go-randomdata" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/apis/v1alpha2/suite_test.go b/pkg/apis/v1alpha2/suite_test.go index 8e8b431dc..d0eddaa57 100644 --- a/pkg/apis/v1alpha2/suite_test.go +++ b/pkg/apis/v1alpha2/suite_test.go @@ -29,8 +29,8 @@ import ( "github.com/aws/karpenter-core/pkg/operator/scheme" coretest "github.com/aws/karpenter-core/pkg/test" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/test" ) var ctx context.Context diff --git a/pkg/auth/util.go b/pkg/auth/util.go index 96ebbc7e5..e3a5189d8 100644 --- a/pkg/auth/util.go +++ b/pkg/auth/util.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/pkcs12" - "github.com/Azure/karpenter/pkg/utils/project" + "github.com/Azure/karpenter-provider-azure/pkg/utils/project" ) // decodePkcs12 decodes a PKCS#12 client certificate by extracting the public certificate and diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index cd96134e3..9ad96d2b9 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -35,15 +35,15 @@ import ( // nolint SA1019 - deprecated package "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/controllers/nodeclaim/inplaceupdate" - - cloudproviderevents "github.com/Azure/karpenter/pkg/cloudprovider/events" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/providers/instancetype" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/controllers/nodeclaim/inplaceupdate" + + cloudproviderevents "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider/events" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instancetype" + "github.com/Azure/karpenter-provider-azure/pkg/utils" nodeclaimutil "github.com/aws/karpenter-core/pkg/utils/nodeclaim" "github.com/samber/lo" diff --git a/pkg/cloudprovider/drift.go b/pkg/cloudprovider/drift.go index be8d58b53..a2ce398ae 100644 --- a/pkg/cloudprovider/drift.go +++ b/pkg/cloudprovider/drift.go @@ -23,9 +23,9 @@ import ( "knative.dev/pkg/logging" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/utils" v1 "k8s.io/api/core/v1" diff --git a/pkg/cloudprovider/suite_test.go b/pkg/cloudprovider/suite_test.go index 56d9ccd1e..ae0136934 100644 --- a/pkg/cloudprovider/suite_test.go +++ b/pkg/cloudprovider/suite_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/tools/record" clock "k8s.io/utils/clock/testing" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/utils" coresettings "github.com/aws/karpenter-core/pkg/apis/settings" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" corecloudprovider "github.com/aws/karpenter-core/pkg/cloudprovider" @@ -43,11 +43,11 @@ import ( . "knative.dev/pkg/logging/testing" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/test" . "github.com/aws/karpenter-core/pkg/test/expectations" ) diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go index 83919ddd7..f393edef1 100644 --- a/pkg/controllers/controllers.go +++ b/pkg/controllers/controllers.go @@ -23,11 +23,11 @@ import ( "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/cloudprovider" - nodeclaimgarbagecollection "github.com/Azure/karpenter/pkg/controllers/nodeclaim/garbagecollection" - "github.com/Azure/karpenter/pkg/controllers/nodeclaim/inplaceupdate" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/utils/project" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" + nodeclaimgarbagecollection "github.com/Azure/karpenter-provider-azure/pkg/controllers/nodeclaim/garbagecollection" + "github.com/Azure/karpenter-provider-azure/pkg/controllers/nodeclaim/inplaceupdate" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/utils/project" ) func NewControllers(ctx context.Context, kubeClient client.Client, cloudProvider *cloudprovider.CloudProvider, instanceProvider *instance.Provider) []controller.Controller { diff --git a/pkg/controllers/nodeclaim/garbagecollection/controller.go b/pkg/controllers/nodeclaim/garbagecollection/controller.go index d6f43fd1b..1ce109abf 100644 --- a/pkg/controllers/nodeclaim/garbagecollection/controller.go +++ b/pkg/controllers/nodeclaim/garbagecollection/controller.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/Azure/karpenter/pkg/cloudprovider" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" "github.com/samber/lo" "go.uber.org/multierr" v1 "k8s.io/api/core/v1" diff --git a/pkg/controllers/nodeclaim/garbagecollection/suite_test.go b/pkg/controllers/nodeclaim/garbagecollection/suite_test.go index dd8e0066b..6459f3daf 100644 --- a/pkg/controllers/nodeclaim/garbagecollection/suite_test.go +++ b/pkg/controllers/nodeclaim/garbagecollection/suite_test.go @@ -23,14 +23,14 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/cloudprovider" - "github.com/Azure/karpenter/pkg/controllers/nodeclaim/garbagecollection" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" + "github.com/Azure/karpenter-provider-azure/pkg/controllers/nodeclaim/garbagecollection" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -40,7 +40,7 @@ import ( . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/test" corecloudprovider "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/aws/karpenter-core/pkg/controllers/provisioning" "github.com/aws/karpenter-core/pkg/controllers/state" diff --git a/pkg/controllers/nodeclaim/inplaceupdate/controller.go b/pkg/controllers/nodeclaim/inplaceupdate/controller.go index 3d1cc1cdf..b6eec8ffb 100644 --- a/pkg/controllers/nodeclaim/inplaceupdate/controller.go +++ b/pkg/controllers/nodeclaim/inplaceupdate/controller.go @@ -35,10 +35,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/utils" ) type Controller struct { diff --git a/pkg/controllers/nodeclaim/inplaceupdate/suite_test.go b/pkg/controllers/nodeclaim/inplaceupdate/suite_test.go index 42726ebc3..35333fbfa 100644 --- a/pkg/controllers/nodeclaim/inplaceupdate/suite_test.go +++ b/pkg/controllers/nodeclaim/inplaceupdate/suite_test.go @@ -33,11 +33,11 @@ import ( . "knative.dev/pkg/logging/testing" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/test" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/utils" ) var ctx context.Context diff --git a/pkg/controllers/nodeclaim/inplaceupdate/utils.go b/pkg/controllers/nodeclaim/inplaceupdate/utils.go index 7ec85d211..6da43d87e 100644 --- a/pkg/controllers/nodeclaim/inplaceupdate/utils.go +++ b/pkg/controllers/nodeclaim/inplaceupdate/utils.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" ) // According to https://pkg.go.dev/encoding/json#Marshal, it's safe to use map-types (and encoding/json in general) to produce diff --git a/pkg/fake/azureresourcegraphapi.go b/pkg/fake/azureresourcegraphapi.go index f6cd1cee3..fe160ae62 100644 --- a/pkg/fake/azureresourcegraphapi.go +++ b/pkg/fake/azureresourcegraphapi.go @@ -24,7 +24,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" - "github.com/Azure/karpenter/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" ) type AzureResourceGraphResourcesInput struct { diff --git a/pkg/fake/azureresourcegraphapi_test.go b/pkg/fake/azureresourcegraphapi_test.go index 45eccdfde..f23bc2796 100644 --- a/pkg/fake/azureresourcegraphapi_test.go +++ b/pkg/fake/azureresourcegraphapi_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/utils" "github.com/samber/lo" "github.com/stretchr/testify/assert" ) diff --git a/pkg/fake/communityimageversionsapi.go b/pkg/fake/communityimageversionsapi.go index 860874f22..6e0c381df 100644 --- a/pkg/fake/communityimageversionsapi.go +++ b/pkg/fake/communityimageversionsapi.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5" - "github.com/Azure/karpenter/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" ) type CommunityGalleryImageVersionsAPI struct { diff --git a/pkg/fake/loadbalancerapi.go b/pkg/fake/loadbalancerapi.go index 5796dbed6..e9d0cc9c8 100644 --- a/pkg/fake/loadbalancerapi.go +++ b/pkg/fake/loadbalancerapi.go @@ -24,7 +24,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" "github.com/samber/lo" ) diff --git a/pkg/fake/networkinterfaceapi.go b/pkg/fake/networkinterfaceapi.go index 4537b0beb..f1fed7163 100644 --- a/pkg/fake/networkinterfaceapi.go +++ b/pkg/fake/networkinterfaceapi.go @@ -26,7 +26,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" "github.com/Azure/go-autorest/autorest/to" - "github.com/Azure/karpenter/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" ) type NetworkInterfaceCreateOrUpdateInput struct { diff --git a/pkg/fake/pricingapi.go b/pkg/fake/pricingapi.go index 3a8f1f377..2b853777c 100644 --- a/pkg/fake/pricingapi.go +++ b/pkg/fake/pricingapi.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/Azure/karpenter/pkg/providers/pricing/client" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing/client" ) const Region = "eastus" diff --git a/pkg/fake/virtualmachineextensionsapi.go b/pkg/fake/virtualmachineextensionsapi.go index be8539695..1bb3d9aa9 100644 --- a/pkg/fake/virtualmachineextensionsapi.go +++ b/pkg/fake/virtualmachineextensionsapi.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" "github.com/Azure/go-autorest/autorest/to" - "github.com/Azure/karpenter/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" ) type VirtualMachineExtensionCreateOrUpdateInput struct { diff --git a/pkg/fake/virtualmachinesapi.go b/pkg/fake/virtualmachinesapi.go index 722b4966a..043b5c55b 100644 --- a/pkg/fake/virtualmachinesapi.go +++ b/pkg/fake/virtualmachinesapi.go @@ -26,8 +26,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" "github.com/Azure/go-autorest/autorest/to" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/utils" "github.com/samber/lo" ) diff --git a/pkg/fake/virtualmachinesapi_test.go b/pkg/fake/virtualmachinesapi_test.go index 9c432b90c..2d83f7bd4 100644 --- a/pkg/fake/virtualmachinesapi_test.go +++ b/pkg/fake/virtualmachinesapi_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" ) // test BeginCreateOrUpdate diff --git a/pkg/metrics/metrics_test.go b/pkg/metrics/metrics_test.go index 75ac81cc4..0f94fab35 100644 --- a/pkg/metrics/metrics_test.go +++ b/pkg/metrics/metrics_test.go @@ -19,7 +19,7 @@ package metrics_test import ( "testing" - "github.com/Azure/karpenter/pkg/metrics" + "github.com/Azure/karpenter-provider-azure/pkg/metrics" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index f496e6ee3..264111c16 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -27,15 +27,15 @@ import ( "k8s.io/client-go/transport" "knative.dev/pkg/ptr" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/auth" - azurecache "github.com/Azure/karpenter/pkg/cache" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/providers/instancetype" - "github.com/Azure/karpenter/pkg/providers/launchtemplate" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" - "github.com/Azure/karpenter/pkg/providers/pricing" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/auth" + azurecache "github.com/Azure/karpenter-provider-azure/pkg/cache" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instancetype" + "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing" "github.com/aws/karpenter-core/pkg/operator" ) diff --git a/pkg/providers/imagefamily/azlinux.go b/pkg/providers/imagefamily/azlinux.go index 1761f85d8..9e0e7a1ce 100644 --- a/pkg/providers/imagefamily/azlinux.go +++ b/pkg/providers/imagefamily/azlinux.go @@ -19,9 +19,9 @@ package imagefamily import ( v1 "k8s.io/api/core/v1" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/providers/imagefamily/bootstrap" - "github.com/Azure/karpenter/pkg/providers/launchtemplate/parameters" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily/bootstrap" + "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate/parameters" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/cloudprovider" diff --git a/pkg/providers/imagefamily/image.go b/pkg/providers/imagefamily/image.go index 84c10831c..c429b0187 100644 --- a/pkg/providers/imagefamily/image.go +++ b/pkg/providers/imagefamily/image.go @@ -24,7 +24,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/aws/karpenter-core/pkg/utils/pretty" "github.com/patrickmn/go-cache" @@ -136,8 +136,6 @@ func BuildImageID(publicGalleryURL, communityImageName, imageVersion string) str // ParseImageIDInfo parses the publicGalleryURL, communityImageName, and imageVersion out of an imageID func ParseCommunityImageIDInfo(imageID string) (string, string, string, error) { // TODO (charliedmcb): assess if doing validation on splitting the string and validating the results is better? Mostly is regex too expensive? - // Discussion on the validation here: - // https://github.com/Azure/karpenter/pull/280#discussion_r1343252930 regexStr := fmt.Sprintf(imageIDFormat, "(?P.*)", "(?P.*)", "(?P.*)") if imageID == "" { return "", "", "", fmt.Errorf("can not parse empty string. Expect it of the form \"%s\"", regexStr) diff --git a/pkg/providers/imagefamily/image_test.go b/pkg/providers/imagefamily/image_test.go index ed6217730..954e786e2 100644 --- a/pkg/providers/imagefamily/image_test.go +++ b/pkg/providers/imagefamily/image_test.go @@ -26,10 +26,10 @@ import ( . "github.com/onsi/gomega" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/test" "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/samber/lo" ) diff --git a/pkg/providers/imagefamily/resolver.go b/pkg/providers/imagefamily/resolver.go index 48a4d8c8b..1a9e85898 100644 --- a/pkg/providers/imagefamily/resolver.go +++ b/pkg/providers/imagefamily/resolver.go @@ -23,11 +23,11 @@ import ( "knative.dev/pkg/logging" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/metrics" - "github.com/Azure/karpenter/pkg/providers/imagefamily/bootstrap" - "github.com/Azure/karpenter/pkg/providers/instancetype" - template "github.com/Azure/karpenter/pkg/providers/launchtemplate/parameters" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/metrics" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily/bootstrap" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instancetype" + template "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate/parameters" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/samber/lo" diff --git a/pkg/providers/imagefamily/ubuntu_2204.go b/pkg/providers/imagefamily/ubuntu_2204.go index 5d43b976d..e25b5752a 100644 --- a/pkg/providers/imagefamily/ubuntu_2204.go +++ b/pkg/providers/imagefamily/ubuntu_2204.go @@ -19,9 +19,9 @@ package imagefamily import ( v1 "k8s.io/api/core/v1" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/providers/imagefamily/bootstrap" - "github.com/Azure/karpenter/pkg/providers/launchtemplate/parameters" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily/bootstrap" + "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate/parameters" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/cloudprovider" diff --git a/pkg/providers/instance/azure_client.go b/pkg/providers/instance/azure_client.go index 0fb7a6a0b..52509c17d 100644 --- a/pkg/providers/instance/azure_client.go +++ b/pkg/providers/instance/azure_client.go @@ -31,12 +31,12 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph" "github.com/Azure/go-autorest/autorest/azure" - "github.com/Azure/karpenter/pkg/auth" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/providers/instance/skuclient" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/auth" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance/skuclient" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" - armopts "github.com/Azure/karpenter/pkg/utils/opts" + armopts "github.com/Azure/karpenter-provider-azure/pkg/utils/opts" klog "k8s.io/klog/v2" ) diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go index 7a04c375b..6e084a84d 100644 --- a/pkg/providers/instance/instance.go +++ b/pkg/providers/instance/instance.go @@ -34,16 +34,16 @@ import ( "knative.dev/pkg/logging" "github.com/Azure/azure-kusto-go/kusto/kql" - "github.com/Azure/karpenter/pkg/cache" - "github.com/Azure/karpenter/pkg/providers/instancetype" - "github.com/Azure/karpenter/pkg/providers/launchtemplate" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/cache" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instancetype" + "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" corecloudprovider "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" "github.com/aws/karpenter-core/pkg/apis/v1alpha5" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" diff --git a/pkg/providers/instance/instance_test.go b/pkg/providers/instance/instance_test.go index f54bdb933..b7e403d63 100644 --- a/pkg/providers/instance/instance_test.go +++ b/pkg/providers/instance/instance_test.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/cache" + "github.com/Azure/karpenter-provider-azure/pkg/cache" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/stretchr/testify/assert" diff --git a/pkg/providers/instance/skuclient/skuclient.go b/pkg/providers/instance/skuclient/skuclient.go index 91f4d5b12..c69e304d0 100644 --- a/pkg/providers/instance/skuclient/skuclient.go +++ b/pkg/providers/instance/skuclient/skuclient.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute" "github.com/Azure/go-autorest/autorest/azure" - "github.com/Azure/karpenter/pkg/auth" + "github.com/Azure/karpenter-provider-azure/pkg/auth" "github.com/Azure/skewer" klog "k8s.io/klog/v2" ) diff --git a/pkg/providers/instance/suite_test.go b/pkg/providers/instance/suite_test.go index 258b51bc8..e249c5635 100644 --- a/pkg/providers/instance/suite_test.go +++ b/pkg/providers/instance/suite_test.go @@ -29,12 +29,12 @@ import ( "k8s.io/client-go/tools/record" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/cloudprovider" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/test" "github.com/aws/karpenter-core/pkg/apis/v1alpha5" "github.com/aws/karpenter-core/pkg/controllers/provisioning" "github.com/aws/karpenter-core/pkg/controllers/state" diff --git a/pkg/providers/instancetype/instancetype.go b/pkg/providers/instancetype/instancetype.go index e3479b26f..ac009b8b0 100644 --- a/pkg/providers/instancetype/instancetype.go +++ b/pkg/providers/instancetype/instancetype.go @@ -27,13 +27,13 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "knative.dev/pkg/ptr" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/utils" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/aws/karpenter-core/pkg/scheduling" - "github.com/Azure/karpenter/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" "github.com/aws/karpenter-core/pkg/utils/resources" ) diff --git a/pkg/providers/instancetype/instancetypes.go b/pkg/providers/instancetype/instancetypes.go index 05b44a760..69e478e95 100644 --- a/pkg/providers/instancetype/instancetypes.go +++ b/pkg/providers/instancetype/instancetypes.go @@ -27,15 +27,16 @@ import ( "github.com/samber/lo" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - kcache "github.com/Azure/karpenter/pkg/cache" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + kcache "github.com/Azure/karpenter-provider-azure/pkg/cache" + "github.com/Azure/karpenter-provider-azure/pkg/utils" "github.com/patrickmn/go-cache" "k8s.io/apimachinery/pkg/util/sets" "knative.dev/pkg/logging" - "github.com/Azure/karpenter/pkg/providers/instance/skuclient" - "github.com/Azure/karpenter/pkg/providers/pricing" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance/skuclient" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing" + "github.com/Azure/skewer" "github.com/alecthomas/units" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" diff --git a/pkg/providers/instancetype/suite_test.go b/pkg/providers/instancetype/suite_test.go index 38fff89fc..c542ae1d8 100644 --- a/pkg/providers/instancetype/suite_test.go +++ b/pkg/providers/instancetype/suite_test.go @@ -55,17 +55,17 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute" - "github.com/Azure/karpenter/pkg/apis" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/cloudprovider" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/providers/instancetype" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" - "github.com/Azure/karpenter/pkg/test" - . "github.com/Azure/karpenter/pkg/test/expectations" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/cloudprovider" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instancetype" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/test" + . "github.com/Azure/karpenter-provider-azure/pkg/test/expectations" + "github.com/Azure/karpenter-provider-azure/pkg/utils" ) var ctx context.Context diff --git a/pkg/providers/launchtemplate/launchtemplate.go b/pkg/providers/launchtemplate/launchtemplate.go index 1ece1b1b7..34c86052d 100644 --- a/pkg/providers/launchtemplate/launchtemplate.go +++ b/pkg/providers/launchtemplate/launchtemplate.go @@ -21,14 +21,14 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/to" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/providers/launchtemplate/parameters" - "github.com/Azure/karpenter/pkg/utils" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate/parameters" + "github.com/Azure/karpenter-provider-azure/pkg/utils" "github.com/samber/lo" v1 "k8s.io/api/core/v1" - "github.com/Azure/karpenter/pkg/apis/settings" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/cloudprovider" "github.com/aws/karpenter-core/pkg/scheduling" diff --git a/pkg/providers/launchtemplate/parameters/types.go b/pkg/providers/launchtemplate/parameters/types.go index a2485531a..b228ef5b7 100644 --- a/pkg/providers/launchtemplate/parameters/types.go +++ b/pkg/providers/launchtemplate/parameters/types.go @@ -17,7 +17,7 @@ limitations under the License. package parameters import ( - "github.com/Azure/karpenter/pkg/providers/imagefamily/bootstrap" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily/bootstrap" ) // StaticParameters define the static launch template parameters diff --git a/pkg/providers/loadbalancer/suite_test.go b/pkg/providers/loadbalancer/suite_test.go index 801b2e026..9e9fbada4 100644 --- a/pkg/providers/loadbalancer/suite_test.go +++ b/pkg/providers/loadbalancer/suite_test.go @@ -28,9 +28,9 @@ import ( . "knative.dev/pkg/logging/testing" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/test" ) var ctx context.Context diff --git a/pkg/providers/pricing/pricing.go b/pkg/providers/pricing/pricing.go index 10e17d7be..5a1d265f7 100644 --- a/pkg/providers/pricing/pricing.go +++ b/pkg/providers/pricing/pricing.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/Azure/karpenter/pkg/providers/pricing/client" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing/client" "github.com/aws/karpenter-core/pkg/utils/pretty" "github.com/samber/lo" "knative.dev/pkg/logging" diff --git a/pkg/providers/pricing/suite_test.go b/pkg/providers/pricing/suite_test.go index 8eef6f940..5186039b0 100644 --- a/pkg/providers/pricing/suite_test.go +++ b/pkg/providers/pricing/suite_test.go @@ -26,9 +26,9 @@ import ( . "github.com/onsi/gomega" . "knative.dev/pkg/logging/testing" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/pricing" - "github.com/Azure/karpenter/pkg/providers/pricing/client" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing/client" ) var ctx context.Context diff --git a/pkg/test/aksnodeclass.go b/pkg/test/aksnodeclass.go index 15d32c84d..06c9a5614 100644 --- a/pkg/test/aksnodeclass.go +++ b/pkg/test/aksnodeclass.go @@ -19,7 +19,7 @@ package test import ( "fmt" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" "github.com/aws/karpenter-core/pkg/test" "github.com/imdario/mergo" "github.com/samber/lo" diff --git a/pkg/test/environment.go b/pkg/test/environment.go index 01f259858..e3a89a18a 100644 --- a/pkg/test/environment.go +++ b/pkg/test/environment.go @@ -19,14 +19,14 @@ package test import ( "context" - azurecache "github.com/Azure/karpenter/pkg/cache" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/imagefamily" - "github.com/Azure/karpenter/pkg/providers/instance" - "github.com/Azure/karpenter/pkg/providers/instancetype" - "github.com/Azure/karpenter/pkg/providers/launchtemplate" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" - "github.com/Azure/karpenter/pkg/providers/pricing" + azurecache "github.com/Azure/karpenter-provider-azure/pkg/cache" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/imagefamily" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instance" + "github.com/Azure/karpenter-provider-azure/pkg/providers/instancetype" + "github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/providers/pricing" "github.com/patrickmn/go-cache" "knative.dev/pkg/ptr" diff --git a/pkg/test/expectations/expectations.go b/pkg/test/expectations/expectations.go index e97c53fe9..fba846af0 100644 --- a/pkg/test/expectations/expectations.go +++ b/pkg/test/expectations/expectations.go @@ -19,8 +19,8 @@ package expectations import ( "fmt" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/test" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/test" . "github.com/onsi/gomega" ) diff --git a/pkg/test/loadbalancer.go b/pkg/test/loadbalancer.go index 980246ac8..f4ff4d91b 100644 --- a/pkg/test/loadbalancer.go +++ b/pkg/test/loadbalancer.go @@ -18,8 +18,8 @@ package test import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork" - "github.com/Azure/karpenter/pkg/fake" - "github.com/Azure/karpenter/pkg/providers/loadbalancer" + "github.com/Azure/karpenter-provider-azure/pkg/fake" + "github.com/Azure/karpenter-provider-azure/pkg/providers/loadbalancer" "github.com/samber/lo" ) diff --git a/pkg/test/settings.go b/pkg/test/settings.go index 04068e2ff..270ad4e4c 100644 --- a/pkg/test/settings.go +++ b/pkg/test/settings.go @@ -22,7 +22,7 @@ import ( "github.com/imdario/mergo" "github.com/samber/lo" - azsettings "github.com/Azure/karpenter/pkg/apis/settings" + azsettings "github.com/Azure/karpenter-provider-azure/pkg/apis/settings" ) type SettingOptions struct { diff --git a/pkg/utils/opts/armopts.go b/pkg/utils/opts/armopts.go index 881c88045..3104b0a99 100644 --- a/pkg/utils/opts/armopts.go +++ b/pkg/utils/opts/armopts.go @@ -22,7 +22,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/Azure/karpenter/pkg/auth" + "github.com/Azure/karpenter-provider-azure/pkg/auth" ) func DefaultArmOpts() *arm.ClientOptions { diff --git a/pkg/webhooks/webhooks.go b/pkg/webhooks/webhooks.go index d905ce72f..c3a11cbd1 100644 --- a/pkg/webhooks/webhooks.go +++ b/pkg/webhooks/webhooks.go @@ -27,7 +27,7 @@ import ( "knative.dev/pkg/webhook/resourcesemantics/defaulting" "knative.dev/pkg/webhook/resourcesemantics/validation" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" ) func NewWebhooks() []knativeinjection.ControllerConstructor { diff --git a/skaffold.yaml b/skaffold.yaml index a2115e19b..8ddaf2b53 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -4,7 +4,7 @@ build: artifacts: - image: controller ko: - main: github.com/Azure/karpenter/cmd/controller + main: github.com/Azure/karpenter-provider-azure/cmd/controller dependencies: paths: - '**/*.go' diff --git a/test/pkg/environment/azure/environment.go b/test/pkg/environment/azure/environment.go index 513cd4e98..b3722a9b4 100644 --- a/test/pkg/environment/azure/environment.go +++ b/test/pkg/environment/azure/environment.go @@ -25,9 +25,9 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/pkg/test" - "github.com/Azure/karpenter/test/pkg/environment/common" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/test" + "github.com/Azure/karpenter-provider-azure/test/pkg/environment/common" ) const WindowsDefaultImage = "mcr.microsoft.com/oss/kubernetes/pause:3.9" diff --git a/test/pkg/environment/azure/setup.go b/test/pkg/environment/azure/setup.go index 72940d0ad..b9ae25b78 100644 --- a/test/pkg/environment/azure/setup.go +++ b/test/pkg/environment/azure/setup.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" ) var persistedSettings []v1.EnvVar diff --git a/test/pkg/environment/common/environment.go b/test/pkg/environment/common/environment.go index 7dca7aae3..c77cbfcd9 100644 --- a/test/pkg/environment/common/environment.go +++ b/test/pkg/environment/common/environment.go @@ -38,7 +38,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/apis" + "github.com/Azure/karpenter-provider-azure/pkg/apis" coreapis "github.com/aws/karpenter-core/pkg/apis" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/operator" diff --git a/test/pkg/environment/common/setup.go b/test/pkg/environment/common/setup.go index 37f0a3662..5b9d6f8cb 100644 --- a/test/pkg/environment/common/setup.go +++ b/test/pkg/environment/common/setup.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" . "github.com/onsi/ginkgo/v2" //nolint:revive,stylecheck . "github.com/onsi/gomega" //nolint:revive,stylecheck "github.com/samber/lo" diff --git a/test/suites/drift/suite_test.go b/test/suites/drift/suite_test.go index 7e78c647a..5dcdcbd92 100644 --- a/test/suites/drift/suite_test.go +++ b/test/suites/drift/suite_test.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/test/pkg/environment/azure" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/test/pkg/environment/azure" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" diff --git a/test/suites/gpu/suite_test.go b/test/suites/gpu/suite_test.go index 5f995128f..f60d8d0ed 100644 --- a/test/suites/gpu/suite_test.go +++ b/test/suites/gpu/suite_test.go @@ -32,8 +32,8 @@ import ( corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/test" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/test/pkg/environment/azure" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/test/pkg/environment/azure" ) var env *azure.Environment diff --git a/test/suites/integration/suite_test.go b/test/suites/integration/suite_test.go index 88b1d582b..064c45016 100644 --- a/test/suites/integration/suite_test.go +++ b/test/suites/integration/suite_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/test/pkg/environment/azure" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/test/pkg/environment/azure" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" ) diff --git a/test/suites/nodeclaim/nodeclaim_test.go b/test/suites/nodeclaim/nodeclaim_test.go index 8f6d9b12d..008e70136 100644 --- a/test/suites/nodeclaim/nodeclaim_test.go +++ b/test/suites/nodeclaim/nodeclaim_test.go @@ -17,7 +17,7 @@ limitations under the License. package nodeclaim_test import ( - "github.com/Azure/karpenter/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/test/suites/nodeclaim/suite_test.go b/test/suites/nodeclaim/suite_test.go index ac11eea59..61497cc78 100644 --- a/test/suites/nodeclaim/suite_test.go +++ b/test/suites/nodeclaim/suite_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/test/pkg/environment/azure" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/test/pkg/environment/azure" corev1beta1 "github.com/aws/karpenter-core/pkg/apis/v1beta1" ) diff --git a/test/suites/utilization/suite_test.go b/test/suites/utilization/suite_test.go index b20f22923..f708714f3 100644 --- a/test/suites/utilization/suite_test.go +++ b/test/suites/utilization/suite_test.go @@ -28,8 +28,8 @@ import ( "github.com/aws/karpenter-core/pkg/apis/v1beta1" "github.com/aws/karpenter-core/pkg/test" - "github.com/Azure/karpenter/pkg/apis/v1alpha2" - "github.com/Azure/karpenter/test/pkg/environment/azure" + "github.com/Azure/karpenter-provider-azure/pkg/apis/v1alpha2" + "github.com/Azure/karpenter-provider-azure/test/pkg/environment/azure" ) var env *azure.Environment