Merge upstream main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hooks",
-  "version": "0.6.2",
+  "version": "0.6.2-element",
   "description": "Three projects are included - k8s: a kubernetes hook implementation that spins up pods dynamically to run a job - docker: A hook implementation of the runner's docker implementation  - A hook lib, which contains shared typescript definitions and utilities that the other packages consume",
   "main": "",
   "directories": {

packages/k8s/src/hooks/prepare-job.ts

@@ -203,10 +203,27 @@ export function createContainerSpec(
     container.entryPointArgs = DEFAULT_CONTAINER_ENTRY_POINT_ARGS
   }
 
+  const resources = new k8s.V1ResourceRequirements()
+  const limit_cpu = process.env.ACTIONS_POD_RESOURCE_LIMIT_CPU
+  const limit_memory = process.env.ACTIONS_POD_RESOURCE_LIMIT_MEMORY
+  const request_memory = process.env.ACTIONS_POD_RESOURCE_REQUEST_MEMORY
+  const request_cpu = process.env.ACTIONS_POD_RESOURCE_REQUEST_CPU
+  const imagePullPolicy = process.env.ACTIONS_POD_IMAGE_PULL_POLICY
+  const tailscaleAuthSecret = process.env.ACTIONS_POD_TAILSCALE_SECRET
+  resources.requests = {
+    ...(request_cpu != undefined) && {cpu: request_cpu},
+    ...(request_memory != undefined) && {memory: request_memory},
+  }
+  resources.limits = {
+    ...(limit_cpu != undefined) && {cpu: limit_cpu},
+    ...(limit_memory != undefined) && {memory: limit_memory},
+  }
   const podContainer = {
     name,
     image: container.image,
-    ports: containerPorts(container)
+    imagePullPolicy: imagePullPolicy ? imagePullPolicy : "Always",
+    ports: containerPorts(container),
+    resources: resources
   } as k8s.V1Container
   if (container.workingDirectory) {
     podContainer.workingDir = container.workingDirectory
@@ -228,6 +245,9 @@ export function createContainerSpec(
       podContainer.env.push({ name: key, value: value as string })
     }
   }
+  if (tailscaleAuthSecret != undefined){
+    podContainer.env.push({ name: "AUTH_KEY", value: tailscaleAuthSecret })
+  }
 
   podContainer.volumeMounts = containerVolumes(
     container.userMountVolumes,

packages/k8s/src/hooks/run-container-step.ts

@@ -105,8 +105,24 @@ function createContainerSpec(
   extension?: k8s.V1PodTemplateSpec
 ): k8s.V1Container {
   const podContainer = new k8s.V1Container()
+  const resources = new k8s.V1ResourceRequirements()
+  const limit_cpu = process.env.ACTIONS_POD_RESOURCE_LIMIT_CPU
+  const limit_memory = process.env.ACTIONS_POD_RESOURCE_LIMIT_MEMORY
+  const request_memory = process.env.ACTIONS_POD_RESOURCE_REQUEST_MEMORY
+  const request_cpu = process.env.ACTIONS_POD_RESOURCE_REQUEST_CPU
+  const imagePullPolicy = process.env.ACTIONS_POD_IMAGE_PULL_POLICY
+  resources.requests = {
+    ...(request_cpu != undefined) && {cpu: request_cpu},
+    ...(request_memory != undefined) && {memory: request_memory},
+  }
+  resources.limits = {
+    ...(limit_cpu != undefined) && {cpu: limit_cpu},
+    ...(limit_memory != undefined) && {memory: limit_memory},
+  }
   podContainer.name = JOB_CONTAINER_NAME
   podContainer.image = container.image
+  podContainer.resources = resources
+  podContainer.imagePullPolicy = imagePullPolicy ? imagePullPolicy : "Always"
   podContainer.workingDir = container.workingDirectory
   podContainer.command = container.entryPoint
     ? [container.entryPoint]