Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved node generation logic to be owned by constraints #1566

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Moved node generation logic to be owned by constraints #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions pkg/apis/provisioning/v1alpha5/constraints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"fmt"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/aws/karpenter/pkg/utils/rand"
Expand Down Expand Up @@ -65,7 +66,18 @@ func (c *Constraints) ValidatePod(pod *v1.Pod) error {
return nil
}

func (c *Constraints) GenerateLabels() map[string]string {
func (c *Constraints) Tighten(pod *v1.Pod) *Constraints {
requirements := c.Requirements.Add(NewPodRequirements(pod).Requirements...)
return &Constraints{
Labels: c.Labels,
Requirements: requirements,
Taints: c.Taints,
Provider: c.Provider,
KubeletConfiguration: c.KubeletConfiguration,
}
}

func (c *Constraints) ToNode() *v1.Node {
labels := map[string]string{}
for key, value := range c.Labels {
labels[key] = value
Expand All @@ -80,16 +92,25 @@ func (c *Constraints) GenerateLabels() map[string]string {
}
}
}
return labels
}

func (c *Constraints) Tighten(pod *v1.Pod) *Constraints {
requirements := c.Requirements.Add(NewPodRequirements(pod).Requirements...)
return &Constraints{
Labels: c.Labels,
Requirements: requirements,
Taints: c.Taints,
Provider: c.Provider,
KubeletConfiguration: c.KubeletConfiguration,
return &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Labels: labels,
Finalizers: []string{TerminationFinalizer},
},
Spec: v1.NodeSpec{
// Taint karpenter.sh/not-ready=NoSchedule to prevent the kube scheduler
// from scheduling pods before we're able to bind them ourselves. The kube
// scheduler has an eventually consistent cache of nodes and pods, so it's
// possible for it to see a provisioned node before it sees the pods bound
// to it. This creates an edge case where other pending pods may be bound to
// the node by the kube scheduler, causing OutOfCPU errors when the
// binpacked pods race to bind to the same node. The system eventually
// heals, but causes delays from additional provisioning (thrash). This
// taint will be removed by the node controller when a node is marked ready.
Taints: append(c.Taints, v1.Taint{
Key: NotReadyTaintKey,
Effect: v1.TaintEffectNoSchedule,
}),
},
}
}
23 changes: 4 additions & 19 deletions pkg/controllers/provisioning/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"sync/atomic"

"github.com/imdario/mergo"
"github.com/prometheus/client_golang/prometheus"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -34,7 +35,6 @@ import (
"github.com/aws/karpenter/pkg/controllers/provisioning/binpacking"
"github.com/aws/karpenter/pkg/controllers/provisioning/scheduling"
"github.com/aws/karpenter/pkg/metrics"
"github.com/aws/karpenter/pkg/utils/functional"
"github.com/aws/karpenter/pkg/utils/injection"
"github.com/aws/karpenter/pkg/utils/pod"
)
Expand Down Expand Up @@ -157,30 +157,15 @@ func (p *Provisioner) launch(ctx context.Context, constraints *v1alpha5.Constrai
pods <- ps
}
return p.cloudProvider.Create(ctx, constraints, packing.InstanceTypeOptions, packing.NodeQuantity, func(node *v1.Node) error {
node.Labels = functional.UnionStringMaps(node.Labels, constraints.GenerateLabels())
node.Spec.Taints = append(node.Spec.Taints, constraints.Taints...)
if err := mergo.Merge(node, constraints.ToNode()); err != nil {
return fmt.Errorf("merging cloud provider node, %w", err)
}
return p.bind(ctx, node, <-pods)
})
}

func (p *Provisioner) bind(ctx context.Context, node *v1.Node, pods []*v1.Pod) (err error) {
defer metrics.Measure(bindTimeHistogram.WithLabelValues(injection.GetNamespacedName(ctx).Name))()

// Add the Karpenter finalizer to the node to enable the termination workflow
node.Finalizers = append(node.Finalizers, v1alpha5.TerminationFinalizer)
// Taint karpenter.sh/not-ready=NoSchedule to prevent the kube scheduler
// from scheduling pods before we're able to bind them ourselves. The kube
// scheduler has an eventually consistent cache of nodes and pods, so it's
// possible for it to see a provisioned node before it sees the pods bound
// to it. This creates an edge case where other pending pods may be bound to
// the node by the kube scheduler, causing OutOfCPU errors when the
// binpacked pods race to bind to the same node. The system eventually
// heals, but causes delays from additional provisioning (thrash). This
// taint will be removed by the node controller when a node is marked ready.
node.Spec.Taints = append(node.Spec.Taints, v1.Taint{
Key: v1alpha5.NotReadyTaintKey,
Effect: v1.TaintEffectNoSchedule,
})
// Idempotently create a node. In rare cases, nodes can come online and
// self register before the controller is able to register a node object
// with the API server. In the common case, we create the node object
Expand Down