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

Jump to bottom

support do-not-evict annotation for karpenter' #409

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

support do-not-evict annotation for karpenter' #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e8db9d
add support for do-not-evict annotation
Jan 5, 2024
0ee0eba
add test to support do-not-evict
Jan 5, 2024
0ce67d7
add test to support do-not-evict logic
Jan 5, 2024
e9636d7
add test to support do-not-evict logic
Jan 5, 2024
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
1 change: 1 addition & 0 deletions api/v1alpha1/revision_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ type RevisionTarget struct {

Istio *Istio `json:"istio,omitempty"`
PodDisruptionBudget *policyv1.PodDisruptionBudget `json:"podDisruptionBudget,omitempty"`
DoNotEvict bool `json:"doNotEvict,omitempty"`
}

type ExternalTest struct {
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/picchu.medium.engineering_revisions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,8 @@ spec:
additionalProperties:
type: string
type: object
doNotEvict:
type: boolean
env:
items:
description: EnvVar represents an environment variable present
Expand Down
1 change: 1 addition & 0 deletions controllers/incarnation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ func (i *Incarnation) sync(ctx context.Context) error {
EnvVars: i.target().Env,
Volumes: i.target().Volumes,
VolumeMounts: i.target().VolumeMounts,
DoNotEvict: i.target().DoNotEvict,
}

if !i.isRoutable() {
Expand Down
7 changes: 7 additions & 0 deletions controllers/plan/syncRevision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (

const annotationDatadogTolerateUnready = "ad.datadoghq.com/tolerate-unready"

const annotationKarpenterDoNotEvict = "karpenter.sh/do-not-evict"

var (
defaultLivenessProbe *corev1.Probe
defaultReadinessProbe *corev1.Probe
Expand Down Expand Up @@ -85,6 +87,7 @@ type SyncRevision struct {
VolumeMounts []corev1.VolumeMount
Volumes []corev1.Volume
PodDisruptionBudget *policyv1.PodDisruptionBudget
DoNotEvict bool
}

func (p *SyncRevision) Printable() interface{} {
Expand Down Expand Up @@ -327,6 +330,10 @@ func (p *SyncRevision) syncReplicaSet(

template.Annotations[annotationDatadogTolerateUnready] = "true"

if p.DoNotEvict {
template.Annotations[annotationKarpenterDoNotEvict] = "true"
}

scaledReplicas := int32(math.Ceil(float64(p.Replicas) * scalingFactor))

// Safe to remove once no existing ReplicaSets are missing the new picchuv1alpha1.LabelIstioApp label
Expand Down
287 changes: 287 additions & 0 deletions controllers/plan/syncRevision_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,111 @@ var (
},
},
}
defaultRevisionPlanNoEviction = &SyncRevision{
App: "testapp",
Tag: "testtag",
Namespace: "testnamespace",
Labels: map[string]string{
"test": "label",
},
Configs: []runtime.Object{},
Ports: []picchuv1alpha1.PortInfo{{
Name: "status",
Protocol: "TCP",
ContainerPort: 4242,
}, {
Name: "http",
Protocol: "TCP",
ContainerPort: 8080,
}},
Replicas: 2,
Image: "docker.medium.sh/test:testtag",
Resources: corev1.ResourceRequirements{
Limits: corev1.ResourceList{
"cpu": mustParseQuantity("4"),
"memory": mustParseQuantity("4352Mi"),
},
Requests: corev1.ResourceList{
"cpu": mustParseQuantity("2"),
"memory": mustParseQuantity("4352Mi"),
},
},
Affinity: &corev1.Affinity{
NodeAffinity: &corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
NodeSelectorTerms: []corev1.NodeSelectorTerm{
{
MatchFields: []corev1.NodeSelectorRequirement{
{Key: "node-role.kubernetes.io/infrastructure", Operator: corev1.NodeSelectorOpExists},
},
},
},
},
},
},
PriorityClassName: "default",
Tolerations: []corev1.Toleration{
{
Key: "infrastructure",
Effect: corev1.TaintEffectNoExecute,
},
},
IAMRole: "testrole",
PodAnnotations: map[string]string{
"sidecar.istio.io/statsInclusionPrefixes": "listener,cluster.outbound",
},
ServiceAccountName: "testaccount",
EnvVars: []corev1.EnvVar{{
Name: "NODE_IP",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "status.hostIP",
},
},
}},
Lifecycle: &corev1.Lifecycle{
PreStop: &corev1.LifecycleHandler{
Exec: &corev1.ExecAction{
Command: []string{"/bin/sh", "-c", "sleep 20"},
},
},
},
Sidecars: []corev1.Container{
{
Name: "test-1",
Image: "test-1:latest",
},
},
Volumes: []corev1.Volume{
{
Name: "shm",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
Medium: corev1.StorageMediumMemory,
},
},
},
},
VolumeMounts: []corev1.VolumeMount{
{
Name: "shm",
MountPath: "/dev/shm",
},
},
PodDisruptionBudget: &policyv1.PodDisruptionBudget{
ObjectMeta: metav1.ObjectMeta{
Name: "testapp",
Namespace: "testnamespace",
Labels: map[string]string{
"test": "label",
},
},
Spec: policyv1.PodDisruptionBudgetSpec{
MaxUnavailable: &maxUnavailable,
},
},
DoNotEvict: true,
}
retiredRevisionPlan = &SyncRevision{
App: "testapp",
Tag: "testtag",
Expand Down Expand Up @@ -328,6 +433,176 @@ var (
},
},
}
defaultExpectedReplicaSetNoEviction = &appsv1.ReplicaSet{
TypeMeta: metav1.TypeMeta{
Kind: "ReplicaSet",
APIVersion: "apps/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "testtag",
Namespace: "testnamespace",
Labels: map[string]string{
"test": "label",
},
Annotations: map[string]string{
"picchu.medium.engineering/autoscaler": "hpa",
},
ResourceVersion: "1",
},
Spec: appsv1.ReplicaSetSpec{
Replicas: &one,
Selector: metav1.SetAsLabelSelector(map[string]string{
"test": "label",
"tag.picchu.medium.engineering": "testtag",
}),
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Name: "testtag",
Namespace: "testnamespace",
Annotations: map[string]string{
"sidecar.istio.io/statsInclusionPrefixes": "listener,cluster.outbound",
picchuv1alpha1.AnnotationIAMRole: "testrole",
annotationDatadogTolerateUnready: "true",
annotationKarpenterDoNotEvict: "true",
},
Labels: map[string]string{
"test": "label",
"tag.picchu.medium.engineering": "testtag",
},
},
Spec: corev1.PodSpec{
ServiceAccountName: "testaccount",
Containers: []corev1.Container{{
Env: []corev1.EnvVar{{
Name: "NODE_IP",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "status.hostIP",
},
},
}},
EnvFrom: []corev1.EnvFromSource{},
Image: "docker.medium.sh/test:testtag",
Name: "testapp",
Ports: []corev1.ContainerPort{{
Name: "status",
Protocol: "TCP",
ContainerPort: 4242,
}, {
Name: "http",
Protocol: "TCP",
ContainerPort: 8080,
}},
Resources: corev1.ResourceRequirements{
Limits: corev1.ResourceList{
"cpu": mustParseQuantity("4"),
"memory": mustParseQuantity("4352Mi"),
},
Requests: corev1.ResourceList{
"cpu": mustParseQuantity("2"),
"memory": mustParseQuantity("4352Mi"),
},
},
LivenessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/running",
Port: intstr.FromString("status"),
},
},
InitialDelaySeconds: 10,
PeriodSeconds: 10,
TimeoutSeconds: 1,
SuccessThreshold: 1,
FailureThreshold: 7,
},
ReadinessProbe: &corev1.Probe{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/running",
Port: intstr.FromString("status"),
},
},
InitialDelaySeconds: 10,
PeriodSeconds: 10,
TimeoutSeconds: 1,
SuccessThreshold: 1,
FailureThreshold: 3,
},
Lifecycle: &corev1.Lifecycle{
PreStop: &corev1.LifecycleHandler{
Exec: &corev1.ExecAction{
Command: []string{"/bin/sh", "-c", "sleep 20"},
},
},
},
VolumeMounts: []corev1.VolumeMount{
{
Name: "shm",
MountPath: "/dev/shm",
},
},
},
{
Image: "test-1:latest",
Name: "test-1",
Env: []corev1.EnvVar{{
Name: "NODE_IP",
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "status.hostIP",
},
},
}},
VolumeMounts: []corev1.VolumeMount{
{
Name: "shm",
MountPath: "/dev/shm",
},
},
},
},
DNSConfig: &corev1.PodDNSConfig{
Options: []corev1.PodDNSConfigOption{{
Name: "ndots",
Value: &oneStr,
}},
},
Affinity: &corev1.Affinity{
NodeAffinity: &corev1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
NodeSelectorTerms: []corev1.NodeSelectorTerm{
{
MatchFields: []corev1.NodeSelectorRequirement{
{Key: "node-role.kubernetes.io/infrastructure", Operator: corev1.NodeSelectorOpExists},
},
},
},
},
},
},
PriorityClassName: "default",
Tolerations: []corev1.Toleration{
{
Key: "infrastructure",
Effect: corev1.TaintEffectNoExecute,
},
},
Volumes: []corev1.Volume{
{
Name: "shm",
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
Medium: corev1.StorageMediumMemory,
},
},
},
},
},
},
},
}

retiredExpectedReplicaSet = &appsv1.ReplicaSet{
TypeMeta: metav1.TypeMeta{
Kind: "ReplicaSet",
Expand Down Expand Up @@ -438,6 +713,18 @@ func TestSyncRevisionNoChange(t *testing.T) {
common.ResourcesEqual(t, defaultExpectedReplicaSet, &rsl.Items[0])
}

func TestSyncRevisionNoEviction(t *testing.T) {
ctx := context.TODO()
log := test.MustNewLogger()
cli := fakeClient(defaultExpectedReplicaSetNoEviction)

rsl := &appsv1.ReplicaSetList{}
assert.NoError(t, defaultRevisionPlanNoEviction.Apply(ctx, cli, halfCluster, log), "Shouldn't return error.")
assert.NoError(t, cli.List(ctx, rsl))
assert.Equal(t, 1, len(rsl.Items))
common.ResourcesEqual(t, defaultExpectedReplicaSetNoEviction, &rsl.Items[0])
}

func TestSyncRevisionWithChange(t *testing.T) {
ctx := context.TODO()
log := test.MustNewLogger()
Expand Down
2 changes: 1 addition & 1 deletion controllers/schedule/schedule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func init() {
date(2021, time.December, 31), // Holiday break

date(2023, time.January, 1),
date(2023, time.December, 20), // 2023 Holiday break "code freeze"
date(2023, time.December, 20), // 2023 Holiday break "code freeze"
date(2023, time.December, 21),
date(2023, time.December, 22),
date(2023, time.December, 23),
Expand Down