Skip to content

Commit

Permalink
Drop logger config from ConfigMap and update defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-innis committed Nov 28, 2023
1 parent 18e7636 commit 222b6be
Show file tree
Hide file tree
Showing 17 changed files with 24 additions and 739 deletions.
2 changes: 0 additions & 2 deletions pkg/apis/apis.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"

"sigs.k8s.io/karpenter/pkg/apis/settings"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/utils/functional"
)
Expand All @@ -33,7 +32,6 @@ var (
)
// AddToScheme may be used to add all resources defined in the project to a Scheme
AddToScheme = Builder.AddToScheme
Settings = []settings.Injectable{&settings.Settings{}}
)

//go:generate controller-gen crd object:headerFile="../../hack/boilerplate.go.txt" paths="./..." output:crd:artifacts:config=crds
Expand Down
27 changes: 0 additions & 27 deletions pkg/apis/settings/injectable.go

This file was deleted.

89 changes: 0 additions & 89 deletions pkg/apis/settings/settings.go

This file was deleted.

128 changes: 0 additions & 128 deletions pkg/apis/settings/suite_test.go

This file was deleted.

36 changes: 0 additions & 36 deletions pkg/apis/settings/zz_generated.deepcopy.go

This file was deleted.

5 changes: 3 additions & 2 deletions pkg/controllers/disruption/orchestration/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/samber/lo"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
. "knative.dev/pkg/logging/testing"
"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/karpenter/pkg/apis"
"sigs.k8s.io/karpenter/pkg/apis/settings"
"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
"sigs.k8s.io/karpenter/pkg/cloudprovider/fake"
disruptionevents "sigs.k8s.io/karpenter/pkg/controllers/disruption/events"
Expand All @@ -37,6 +37,7 @@ import (
"sigs.k8s.io/karpenter/pkg/controllers/state"
"sigs.k8s.io/karpenter/pkg/controllers/state/informer"
"sigs.k8s.io/karpenter/pkg/operator/controller"
"sigs.k8s.io/karpenter/pkg/operator/options"
"sigs.k8s.io/karpenter/pkg/operator/scheme"
"sigs.k8s.io/karpenter/pkg/test"
. "sigs.k8s.io/karpenter/pkg/test/expectations"
Expand Down Expand Up @@ -71,7 +72,7 @@ func TestAPIs(t *testing.T) {

var _ = BeforeSuite(func() {
env = test.NewEnvironment(scheme.Scheme, test.WithCRDs(apis.CRDs...))
ctx = settings.ToContext(ctx, test.Settings(settings.Settings{DriftEnabled: true}))
ctx = options.ToContext(ctx, test.Options(test.OptionsFields{FeatureGates: test.FeatureGates{Drift: lo.ToPtr(true)}}))
fakeClock = clock.NewFakeClock(time.Now())
cloudProvider = fake.NewCloudProvider()
cluster = state.NewCluster(fakeClock, env.Client, cloudProvider)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/pkg/logging"

"sigs.k8s.io/karpenter/pkg/apis/settings"
"sigs.k8s.io/karpenter/pkg/cloudprovider"
"sigs.k8s.io/karpenter/pkg/cloudprovider/fake"
"sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling"
Expand Down Expand Up @@ -115,7 +114,6 @@ func TestSchedulingProfile(t *testing.T) {
func benchmarkScheduler(b *testing.B, instanceCount, podCount int) {
// disable logging
ctx = logging.WithLogger(context.Background(), zap.NewNop().Sugar())
ctx = settings.ToContext(ctx, test.Settings())
nodePool := test.NodePool()

instanceTypes := fake.InstanceTypes(instanceCount)
Expand Down

0 comments on commit 222b6be

Please sign in to comment.