Skip to content

Commit

Permalink
update pkg name
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeykranga committed Oct 3, 2024
1 parent 239f4b3 commit e909589
Show file tree
Hide file tree
Showing 158 changed files with 699 additions and 699 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ linters-settings:
locale: US
ignore-words: []
goimports:
local-prefixes: sigs.k8s.io/karpenter
local-prefixes: github.com/extole/karpenter
goheader:
template: |-
Copyright The Kubernetes Authors.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ uninstall-kwok: ## Uninstall kwok provider
UNINSTALL_KWOK=true ./hack/install-kwok.sh

build-with-kind: # build with kind assumes the image will be uploaded directly onto the kind control plane, without an image repository
$(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KO_DOCKER_REPO="$(KWOK_REPO)" ko build sigs.k8s.io/karpenter/kwok))
$(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KO_DOCKER_REPO="$(KWOK_REPO)" ko build github.com/extole/karpenter/kwok))
$(eval IMG_REPOSITORY=$(shell echo $(CONTROLLER_IMG) | cut -d ":" -f 1))
$(eval IMG_TAG=latest)

build: ## Build the Karpenter KWOK controller images using ko build
$(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KO_DOCKER_REPO="$(KWOK_REPO)" ko build -B sigs.k8s.io/karpenter/kwok))
$(eval CONTROLLER_IMG=$(shell $(WITH_GOFLAGS) KO_DOCKER_REPO="$(KWOK_REPO)" ko build -B github.com/extole/karpenter/kwok))
$(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))
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The Karpenter project is an SIG autoscaling project that has the following two components:
- Kubernetes Custom Resource Definitions (CRDs)
- Corresponding Go API in the form of [`sigs.k8s.io/karpenter`](https://pkg.go.dev/sigs.k8s.io/karpenter) Go package
- Corresponding Go API in the form of [`github.com/extole/karpenter`](https://pkg.go.dev/github.com/extole/karpenter) Go package

This repository is the home for both of the above components.

Expand Down
2 changes: 1 addition & 1 deletion SECURITY-INSIGHTS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ contribution-policy:
documentation:
- 'https://karpenter.sh/docs'
distribution-points:
- 'https://pkg.go.dev/sigs.k8s.io/karpenter'
- 'https://pkg.go.dev/github.com/extole/karpenter'
security-artifacts:
threat-model:
threat-model-created: true
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module sigs.k8s.io/karpenter
module github.com/extole/karpenter

go 1.22.3

Expand Down
2 changes: 1 addition & 1 deletion kwok/apis/apis.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"

"sigs.k8s.io/karpenter/pkg/utils/functional"
"github.com/extole/karpenter/pkg/utils/functional"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions kwok/cloudprovider/cloudprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/karpenter/kwok/apis/v1alpha1"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/scheduling"
"github.com/extole/karpenter/kwok/apis/v1alpha1"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/scheduling"
)

func NewCloudProvider(ctx context.Context, kubeClient client.Client, instanceTypes []*cloudprovider.InstanceType) *CloudProvider {
Expand Down
8 changes: 4 additions & 4 deletions kwok/cloudprovider/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

"sigs.k8s.io/karpenter/kwok/apis/v1alpha1"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/scheduling"
"github.com/extole/karpenter/kwok/apis/v1alpha1"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/scheduling"
)

var (
Expand Down
12 changes: 6 additions & 6 deletions kwok/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ package main
import (
"sigs.k8s.io/controller-runtime/pkg/log"

"sigs.k8s.io/karpenter/kwok/apis/v1alpha1"
kwok "sigs.k8s.io/karpenter/kwok/cloudprovider"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/controllers"
"sigs.k8s.io/karpenter/pkg/controllers/state"
"sigs.k8s.io/karpenter/pkg/operator"
"github.com/extole/karpenter/kwok/apis/v1alpha1"
kwok "github.com/extole/karpenter/kwok/cloudprovider"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/controllers"
"github.com/extole/karpenter/pkg/controllers/state"
"github.com/extole/karpenter/pkg/operator"
)

func init() {
Expand Down
8 changes: 4 additions & 4 deletions kwok/tools/gen_instance_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

kwok "sigs.k8s.io/karpenter/kwok/cloudprovider"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/scheduling"
kwok "github.com/extole/karpenter/kwok/cloudprovider"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/scheduling"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/apis.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"

"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/utils/functional"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/utils/functional"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/v1beta1/nodeclaim_validation_cel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
. "github.com/onsi/gomega"
"github.com/samber/lo"

. "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
. "github.com/extole/karpenter/pkg/apis/v1beta1"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/v1beta1/nodeclaim_validation_webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
"github.com/samber/lo"

. "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
. "github.com/extole/karpenter/pkg/apis/v1beta1"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/v1beta1/nodepool_budgets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clock "k8s.io/utils/clock/testing"

. "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
. "github.com/extole/karpenter/pkg/apis/v1beta1"
)

var _ = Describe("Budgets", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/v1beta1/nodepool_validation_cel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"

. "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
. "github.com/extole/karpenter/pkg/apis/v1beta1"
)

var _ = Describe("CEL/Validation", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/v1beta1/nodepool_validation_webhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"

. "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
. "github.com/extole/karpenter/pkg/apis/v1beta1"
)

var _ = Describe("Webhook/Validation", func() {
Expand Down
12 changes: 6 additions & 6 deletions pkg/apis/v1beta1/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
. "github.com/onsi/gomega"
"github.com/samber/lo"

. "sigs.k8s.io/karpenter/pkg/utils/testing"
. "github.com/extole/karpenter/pkg/utils/testing"

"sigs.k8s.io/karpenter/pkg/apis"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/operator/scheme"
"sigs.k8s.io/karpenter/pkg/test"
. "sigs.k8s.io/karpenter/pkg/test/expectations"
"github.com/extole/karpenter/pkg/apis"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/operator/scheme"
"github.com/extole/karpenter/pkg/test"
. "github.com/extole/karpenter/pkg/test/expectations"
)

var ctx context.Context
Expand Down
12 changes: 6 additions & 6 deletions pkg/cloudprovider/fake/cloudprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"

"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/scheduling"
"sigs.k8s.io/karpenter/pkg/test"
"sigs.k8s.io/karpenter/pkg/utils/functional"
"sigs.k8s.io/karpenter/pkg/utils/resources"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/scheduling"
"github.com/extole/karpenter/pkg/test"
"github.com/extole/karpenter/pkg/utils/functional"
"github.com/extole/karpenter/pkg/utils/resources"
)

var _ cloudprovider.CloudProvider = (*CloudProvider)(nil)
Expand Down
6 changes: 3 additions & 3 deletions pkg/cloudprovider/fake/instancetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/scheduling"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/scheduling"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/cloudprovider/metrics/cloudprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"github.com/prometheus/client_golang/prometheus"
crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"

"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/operator/injection"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/operator/injection"

"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/metrics"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/metrics"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/metrics/cloudprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/cloudprovider/metrics"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/cloudprovider/metrics"
)

var _ = Describe("Cloudprovider", func() {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cloudprovider/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"

"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/scheduling"
"sigs.k8s.io/karpenter/pkg/utils/resources"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/scheduling"
"github.com/extole/karpenter/pkg/utils/resources"
)

type DriftReason string
Expand Down
42 changes: 21 additions & 21 deletions pkg/controllers/controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ import (
"k8s.io/utils/clock"
"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/karpenter/pkg/operator/controller"
"github.com/extole/karpenter/pkg/operator/controller"

"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/controllers/disruption"
"sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration"
"sigs.k8s.io/karpenter/pkg/controllers/leasegarbagecollection"
metricsnode "sigs.k8s.io/karpenter/pkg/controllers/metrics/node"
metricsnodepool "sigs.k8s.io/karpenter/pkg/controllers/metrics/nodepool"
metricspod "sigs.k8s.io/karpenter/pkg/controllers/metrics/pod"
"sigs.k8s.io/karpenter/pkg/controllers/node/termination"
"sigs.k8s.io/karpenter/pkg/controllers/node/termination/terminator"
nodeclaimconsistency "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/consistency"
nodeclaimdisruption "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/disruption"
nodeclaimgarbagecollection "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/garbagecollection"
nodeclaimlifecycle "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/lifecycle"
nodeclaimtermination "sigs.k8s.io/karpenter/pkg/controllers/nodeclaim/termination"
nodepoolcounter "sigs.k8s.io/karpenter/pkg/controllers/nodepool/counter"
nodepoolhash "sigs.k8s.io/karpenter/pkg/controllers/nodepool/hash"
"sigs.k8s.io/karpenter/pkg/controllers/provisioning"
"sigs.k8s.io/karpenter/pkg/controllers/state"
"sigs.k8s.io/karpenter/pkg/controllers/state/informer"
"sigs.k8s.io/karpenter/pkg/events"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/controllers/disruption"
"github.com/extole/karpenter/pkg/controllers/disruption/orchestration"
"github.com/extole/karpenter/pkg/controllers/leasegarbagecollection"
metricsnode "github.com/extole/karpenter/pkg/controllers/metrics/node"
metricsnodepool "github.com/extole/karpenter/pkg/controllers/metrics/nodepool"
metricspod "github.com/extole/karpenter/pkg/controllers/metrics/pod"
"github.com/extole/karpenter/pkg/controllers/node/termination"
"github.com/extole/karpenter/pkg/controllers/node/termination/terminator"
nodeclaimconsistency "github.com/extole/karpenter/pkg/controllers/nodeclaim/consistency"
nodeclaimdisruption "github.com/extole/karpenter/pkg/controllers/nodeclaim/disruption"
nodeclaimgarbagecollection "github.com/extole/karpenter/pkg/controllers/nodeclaim/garbagecollection"
nodeclaimlifecycle "github.com/extole/karpenter/pkg/controllers/nodeclaim/lifecycle"
nodeclaimtermination "github.com/extole/karpenter/pkg/controllers/nodeclaim/termination"
nodepoolcounter "github.com/extole/karpenter/pkg/controllers/nodepool/counter"
nodepoolhash "github.com/extole/karpenter/pkg/controllers/nodepool/hash"
"github.com/extole/karpenter/pkg/controllers/provisioning"
"github.com/extole/karpenter/pkg/controllers/state"
"github.com/extole/karpenter/pkg/controllers/state/informer"
"github.com/extole/karpenter/pkg/events"
)

func NewControllers(
Expand Down
22 changes: 11 additions & 11 deletions pkg/controllers/disruption/consolidation.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ import (
"k8s.io/utils/clock"
"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/karpenter/pkg/apis/v1alpha5"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events"
"sigs.k8s.io/karpenter/pkg/controllers/disruption/orchestration"
"sigs.k8s.io/karpenter/pkg/controllers/provisioning"
pscheduling "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling"
"sigs.k8s.io/karpenter/pkg/controllers/state"
"sigs.k8s.io/karpenter/pkg/events"
"sigs.k8s.io/karpenter/pkg/operator/options"
"sigs.k8s.io/karpenter/pkg/scheduling"
"github.com/extole/karpenter/pkg/apis/v1alpha5"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
disruptionevents "github.com/extole/karpenter/pkg/controllers/disruption/events"
"github.com/extole/karpenter/pkg/controllers/disruption/orchestration"
"github.com/extole/karpenter/pkg/controllers/provisioning"
pscheduling "github.com/extole/karpenter/pkg/controllers/provisioning/scheduling"
"github.com/extole/karpenter/pkg/controllers/state"
"github.com/extole/karpenter/pkg/events"
"github.com/extole/karpenter/pkg/operator/options"
"github.com/extole/karpenter/pkg/scheduling"
)

// consolidationTTL is the TTL between creating a consolidation command and validating that it still works.
Expand Down
22 changes: 11 additions & 11 deletions pkg/controllers/disruption/consolidation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"sigs.k8s.io/karpenter/pkg/apis/v1alpha5"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/cloudprovider/fake"
"sigs.k8s.io/karpenter/pkg/controllers/disruption"
pscheduling "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling"
"sigs.k8s.io/karpenter/pkg/events"
"sigs.k8s.io/karpenter/pkg/operator/options"
"sigs.k8s.io/karpenter/pkg/scheduling"
"sigs.k8s.io/karpenter/pkg/test"
. "sigs.k8s.io/karpenter/pkg/test/expectations"
"github.com/extole/karpenter/pkg/apis/v1alpha5"
"github.com/extole/karpenter/pkg/apis/v1beta1"
"github.com/extole/karpenter/pkg/cloudprovider"
"github.com/extole/karpenter/pkg/cloudprovider/fake"
"github.com/extole/karpenter/pkg/controllers/disruption"
pscheduling "github.com/extole/karpenter/pkg/controllers/provisioning/scheduling"
"github.com/extole/karpenter/pkg/events"
"github.com/extole/karpenter/pkg/operator/options"
"github.com/extole/karpenter/pkg/scheduling"
"github.com/extole/karpenter/pkg/test"
. "github.com/extole/karpenter/pkg/test/expectations"
)

var _ = Describe("Consolidation", func() {
Expand Down
Loading

0 comments on commit e909589

Please sign in to comment.