fix: make spot weight optional and default to 60 (#445)

dailydotdev · Oct 30, 2024 · 1b539b8 · 1b539b8
1 parent dc64f68
commit 1b539b8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -1 +1,2 @@
 export const urnPrefix = 'dailydotdev:pulumi-common';
+export const defaultSpotWeight = 60;
diff --git a/src/k8s.ts b/src/k8s.ts
@@ -12,6 +12,7 @@ import EnvVar = core.v1.EnvVar;
 import { Resource } from '@pulumi/pulumi/resource';
 import { camelToUnderscore } from './utils';
 import { NodeLabels } from './kubernetes';
+import { defaultSpotWeight } from './constants';
 
 export type PodResources = { cpu?: string; memory?: string };
 
@@ -230,7 +231,7 @@ export type KubernetesApplicationArgs = {
   }>;
   spot?: {
     enabled: boolean;
-    weight: number;
+    weight?: number;
     required?: boolean;
   };
 };
@@ -288,7 +289,8 @@ export const createAutoscaledApplication = ({
   const affinity: k8s.types.input.core.v1.Affinity = {};
 
   if (spot?.enabled && !isAdhocEnv) {
-    const nonSpotWeight = 100 - spot.weight;
+    const spotWeight = spot?.weight ?? defaultSpotWeight;
+    const nonSpotWeight = 100 - spotWeight;
     tolerations.push({
       key: 'spot',
       operator: 'Equal',
@@ -314,7 +316,7 @@ export const createAutoscaledApplication = ({
       : {
           preferredDuringSchedulingIgnoredDuringExecution: [
             {
-              weight: spot.weight,
+              weight: spotWeight,
               preference: {
                 matchExpressions: [
                   {

diff --git a/src/suite/index.ts b/src/suite/index.ts
@@ -33,6 +33,7 @@ import {
 import { location } from '../config';
 import { stripCpuFromLimits } from '../utils';
 import { NodeLabels } from '../kubernetes';
+import { defaultSpotWeight } from '../constants';
 
 /**
  * Takes a custom definition of an autoscaling metric and turn it into a k8s definition
@@ -156,7 +157,7 @@ function deployCron(
     limits,
     requests,
     dependsOn,
-    spot = { enabled: false, weight: 50, required: false },
+    spot = { enabled: false, weight: defaultSpotWeight, required: false },
   }: CronArgs,
 ): k8s.batch.v1.CronJob {
   const appResourcePrefix = `${resourcePrefix}${
@@ -168,7 +169,8 @@ function deployCron(
   const affinity: k8s.types.input.core.v1.Affinity = {};
 
   if (spot?.enabled) {
-    const nonSpotWeight = 100 - spot.weight;
+    const spotWeight = spot?.weight ?? defaultSpotWeight;
+    const nonSpotWeight = 100 - spotWeight;
     tolerations.push({
       key: 'spot',
       operator: 'Equal',
@@ -194,7 +196,7 @@ function deployCron(
       : {
           preferredDuringSchedulingIgnoredDuringExecution: [
             {
-              weight: spot.weight,
+              weight: spotWeight,
               preference: {
                 matchExpressions: [
                   {
@@ -322,7 +324,7 @@ function deployApplication(
     ports = [],
     servicePorts = [],
     backendConfig,
-    spot = { enabled: false, weight: 60, required: false },
+    spot = { enabled: false, weight: defaultSpotWeight, required: false },
   }: ApplicationArgs,
 ): ApplicationReturn {
   const appResourcePrefix = `${resourcePrefix}${

diff --git a/src/suite/types.ts b/src/suite/types.ts
@@ -50,7 +50,7 @@ export type ApplicationArgs = {
   }>;
   spot?: {
     enabled: boolean;
-    weight: number;
+    weight?: number;
     required?: boolean;
   };
 };
@@ -80,7 +80,7 @@ export type CronArgs = {
   volumeMounts?: Input<Input<k8s.types.input.core.v1.VolumeMount>[]>;
   spot?: {
     enabled: boolean;
-    weight: number;
+    weight?: number;
     required?: boolean;
   };
 };
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export const urnPrefix = 'dailydotdev:pulumi-common';
		export const defaultSpotWeight = 60;