Skip to content

Commit

Permalink
chore: Migrate scheduling libraries to karpenter-core (#2675)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ellistarn
ellistarn committed Oct 17, 2022
1 parent 1eeb010 commit 5561a42
Show file tree
Hide file tree
Showing 24 changed files with 36 additions and 34 deletions.
14 changes: 8 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
/karpenter
# Go toolchain
coverage.out
coverage.html
*.test
*.csv
*.cpuprofile
*.heapprofile
go.work
go.work.sum

# Common in OSs and IDEs
# Environment
.idea
.vscode
.DS_Store

# Go Benchmarking
*.cpuprofile
*.heapprofile
# Project Specific
*.csv
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/avast/retry-go v3.0.0+incompatible
github.com/aws/aws-sdk-go v1.44.114
github.com/aws/karpenter-core v0.0.1
github.com/aws/karpenter-core v0.0.2-0.20221017165612-70c16abe656e
github.com/deckarep/golang-set v1.8.0
github.com/go-logr/logr v1.2.3
github.com/go-logr/zapr v1.2.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHS
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
github.com/aws/aws-sdk-go v1.44.114 h1:plIkWc/RsHr3DXBj4MEw9sEW4CcL/e2ryokc+CKyq1I=
github.com/aws/aws-sdk-go v1.44.114/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/karpenter-core v0.0.1 h1:DYYh7XotfMm7L6pDo01NZJP3yx8JT3WkeG+3Druavgo=
github.com/aws/karpenter-core v0.0.1/go.mod h1:TE1x+V+QL2gZ6EOU5PMXkIsusSX8tVo3toA+8BdYiIY=
github.com/aws/karpenter-core v0.0.2-0.20221017165612-70c16abe656e h1:X1zyJUeKttAjzNmdd3FkcrH0Vlq+fEznC7izXJcdE4w=
github.com/aws/karpenter-core v0.0.2-0.20221017165612-70c16abe656e/go.mod h1:vQko57qiP/cxqWDgLTTvdR9A6AUXriWd8eg0dDTJJpY=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudproviders/aws/cloudprovider/amifamily/ami.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/apis/awsnodetemplate/v1alpha1"
awsv1alpha1 "github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/functional"
"github.com/aws/karpenter/pkg/utils/pretty"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudproviders/aws/cloudprovider/instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"
awserrors "github.com/aws/karpenter/pkg/cloudproviders/aws/errors"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/functional"
"github.com/aws/karpenter/pkg/utils/injection"
"github.com/aws/karpenter/pkg/utils/options"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudproviders/aws/cloudprovider/instancetype.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/cloudproviders/aws/cloudprovider/amifamily"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/injection"
"github.com/aws/karpenter/pkg/utils/resources"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudproviders/common/cloudprovider/fake/cloudprovider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/test"

v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudproviders/common/cloudprovider/fake/instancetype.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"

"github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudproviders/common/cloudprovider/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter-core/pkg/scheduling"
)

// Options are injected into cloud providers' factories
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/consolidation/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"

v1 "k8s.io/api/core/v1"
"knative.dev/pkg/logging"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/config"
scheduler "github.com/aws/karpenter/pkg/controllers/provisioning/scheduling"
"github.com/aws/karpenter/pkg/controllers/state"
"github.com/aws/karpenter/pkg/events"
"github.com/aws/karpenter/pkg/metrics"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/injection"
"github.com/aws/karpenter/pkg/utils/node"
"github.com/aws/karpenter/pkg/utils/pod"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/existingnode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
v1 "k8s.io/api/core/v1"

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"
"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/controllers/state"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/resources"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/resources"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/scheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/controllers/state"
"github.com/aws/karpenter/pkg/events"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/utils/resources"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/scheduling_benchmark_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider/fake"
pscheduling "github.com/aws/karpenter/pkg/controllers/provisioning/scheduling"
"github.com/aws/karpenter/pkg/controllers/state"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/test"

"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/topology.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"math"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/controllers/state"
"github.com/aws/karpenter/pkg/scheduling"

"go.uber.org/multierr"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/topologygroup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/util/runtime"
utilsets "k8s.io/apimachinery/pkg/util/sets"

"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter-core/pkg/scheduling"
)

type TopologyType byte
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/provisioning/scheduling/topologynodefilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package scheduling
import (
v1 "k8s.io/api/core/v1"

"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter-core/pkg/scheduling"
)

// TopologyNodeFilter is used to determine if a given actual node or scheduling node matches the pod's node selectors
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/state/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/config"
"github.com/aws/karpenter/pkg/scheduling"
atomicutils "github.com/aws/karpenter/pkg/utils/atomic"
podutils "github.com/aws/karpenter/pkg/utils/pod"
"github.com/aws/karpenter/pkg/utils/resources"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/state/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/controllers/termination/terminate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/cloudproviders/common/cloudprovider"
"github.com/aws/karpenter/pkg/scheduling"
podutil "github.com/aws/karpenter/pkg/utils/pod"
"github.com/aws/karpenter/pkg/utils/ptr"
)
Expand Down
4 changes: 2 additions & 2 deletions test/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ go 1.19
require (
github.com/aws/aws-sdk-go v1.44.114
github.com/aws/karpenter v0.18.0
github.com/aws/karpenter-core v0.0.1
github.com/aws/karpenter-core v0.0.2-0.20221017165612-70c16abe656e
github.com/onsi/ginkgo/v2 v2.2.0
github.com/onsi/gomega v1.21.1
github.com/samber/lo v1.32.0
k8s.io/api v0.25.2
k8s.io/apimachinery v0.25.2
k8s.io/client-go v0.25.2
knative.dev/pkg v0.0.0-20221011175852-714b7630a836
knative.dev/pkg v0.0.0-20221014164553-b812affa3893
sigs.k8s.io/controller-runtime v0.13.0
)

Expand Down
8 changes: 4 additions & 4 deletions test/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/aws/aws-sdk-go v1.44.114 h1:plIkWc/RsHr3DXBj4MEw9sEW4CcL/e2ryokc+CKyq1I=
github.com/aws/aws-sdk-go v1.44.114/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/karpenter-core v0.0.1 h1:DYYh7XotfMm7L6pDo01NZJP3yx8JT3WkeG+3Druavgo=
github.com/aws/karpenter-core v0.0.1/go.mod h1:TE1x+V+QL2gZ6EOU5PMXkIsusSX8tVo3toA+8BdYiIY=
github.com/aws/karpenter-core v0.0.2-0.20221017165612-70c16abe656e h1:X1zyJUeKttAjzNmdd3FkcrH0Vlq+fEznC7izXJcdE4w=
github.com/aws/karpenter-core v0.0.2-0.20221017165612-70c16abe656e/go.mod h1:vQko57qiP/cxqWDgLTTvdR9A6AUXriWd8eg0dDTJJpY=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down Expand Up @@ -836,8 +836,8 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/pkg v0.0.0-20221011175852-714b7630a836 h1:0N7Zo/O+xeUUebJPm9keBaGclrUoEbljr3J1MsqtaIM=
knative.dev/pkg v0.0.0-20221011175852-714b7630a836/go.mod h1:DMTRDJ5WRxf/DrlOPzohzfhSuJggscLZ8EavOq9O/x8=
knative.dev/pkg v0.0.0-20221014164553-b812affa3893 h1:RU6XnkYE017AWfKgN+eQLyDcT99eJKgz+ZWOvb+3fhc=
knative.dev/pkg v0.0.0-20221014164553-b812affa3893/go.mod h1:DMTRDJ5WRxf/DrlOPzohzfhSuJggscLZ8EavOq9O/x8=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
2 changes: 1 addition & 1 deletion test/suites/integration/kubelet_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (

"github.com/aws/karpenter-core/pkg/apis/provisioning/v1alpha5"

"github.com/aws/karpenter-core/pkg/scheduling"
"github.com/aws/karpenter/pkg/apis/awsnodetemplate/v1alpha1"
awsv1alpha1 "github.com/aws/karpenter/pkg/cloudproviders/aws/apis/v1alpha1"
"github.com/aws/karpenter/pkg/scheduling"
"github.com/aws/karpenter/pkg/test"
)

Expand Down

0 comments on commit 5561a42

Please sign in to comment.