Skip to content

Commit 66f2c05

Browse files
authored
Remove legacy karpenter_pools_enabled logic (#858)
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
1 parent 09defec commit 66f2c05

File tree

2 files changed

+16
-43
lines changed

2 files changed

+16
-43
lines changed

provisioner/clusterpy.go

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -421,53 +421,33 @@ func (p *clusterpyProvisioner) provision(
421421
return err
422422
}
423423

424-
if karpenterProvisioner.isKarpenterEnabled() {
425-
err = p.apply(
426-
ctx,
427-
logger,
428-
tokenSource,
429-
cluster,
430-
deletions,
431-
manifests,
432-
postOptions,
433-
)
434-
if err != nil {
435-
return err
436-
}
424+
err = p.apply(
425+
ctx,
426+
logger,
427+
tokenSource,
428+
cluster,
429+
deletions,
430+
manifests,
431+
postOptions,
432+
)
433+
if err != nil {
434+
return err
437435
}
438436

439-
if karpenterProvisioner.isKarpenterEnabled() {
440-
if err = nodePoolGroups["karpenterPools"].provisionNodePoolGroup(ctx, values, updater, cluster, p.applyOnly); err != nil {
441-
return err
442-
}
437+
if err = nodePoolGroups["karpenterPools"].provisionNodePoolGroup(ctx, values, updater, cluster, p.applyOnly); err != nil {
438+
return err
443439
}
444440

445441
// clean up removed node pools
446442
err = caNodePoolProvisioner.Reconcile(ctx, updater)
447443
if err != nil {
448444
return err
449445
}
450-
if karpenterProvisioner.isKarpenterEnabled() {
451-
err = karpenterProvisioner.Reconcile(ctx, updater)
452-
if err != nil {
453-
return err
454-
}
446+
err = karpenterProvisioner.Reconcile(ctx, updater)
447+
if err != nil {
448+
return err
455449
}
456450

457-
if !karpenterProvisioner.isKarpenterEnabled() {
458-
err = p.apply(
459-
ctx,
460-
logger,
461-
tokenSource,
462-
cluster,
463-
deletions,
464-
manifests,
465-
postOptions,
466-
)
467-
if err != nil {
468-
return err
469-
}
470-
}
471451
return nil
472452
}
473453

provisioner/node_pools.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,6 @@ func (p *KarpenterNodePoolProvisioner) provisionNodePool(ctx context.Context, no
234234
return nil
235235
}
236236

237-
func (p *KarpenterNodePoolProvisioner) isKarpenterEnabled() bool {
238-
if v, found := p.cluster.ConfigItems["karpenter_pools_enabled"]; found && v == "true" {
239-
return true
240-
}
241-
return false
242-
}
243-
244237
func (p *KarpenterNodePoolProvisioner) Reconcile(ctx context.Context, updater updatestrategy.UpdateStrategy) error {
245238
karpenterPools := p.cluster.KarpenterPools()
246239

0 commit comments

Comments
 (0)