@toa.io/operations 1.0.0-alpha.234 → 1.0.0-alpha.239

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "1.0.0-alpha.234",
+  "version": "1.0.0-alpha.239",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -29,10 +29,10 @@
   "dependencies": {
     "@toa.io/filesystem": "1.0.0-alpha.225",
     "@toa.io/generic": "1.0.0-alpha.225",
-    "@toa.io/norm": "1.0.0-alpha.228",
+    "@toa.io/norm": "1.0.0-alpha.239",
     "@toa.io/yaml": "1.0.0-alpha.225",
     "execa": "5.1.1",
     "fs-extra": "11.1.1"
   },
-  "gitHead": "0a102917aca0115eadc2410f0a7836e3e40096a0"
+  "gitHead": "35935a713890e680fccbd23f77570da2bc12fd64"
 }

package/src/deployment/.deployment/.describe/compositions.js

@@ -7,6 +7,9 @@ function compositions (compositions, dependency) {
   for (const composition of compositions) {
     addVariables(composition, dependency.variables)
     addMounts(composition, dependency.mounts)
+
+    if (dependency.probe !== undefined && dependency.probe !== false)
+      composition.probe ??= dependency.probe
   }
 }
 

package/src/deployment/.deployment/.describe/services.js

@@ -2,9 +2,14 @@
 
 const { addVariables } = require('./variables')
 
-function services (services, variables) {
+function services (services, variables, probe) {
   for (const service of services) {
     addVariables(service, variables)
+
+    if (service.probe === false)
+      delete service.probe
+    else if (service.probe === undefined && probe !== undefined && probe !== false)
+      service.probe = probe
   }
 }
 

package/src/deployment/.deployment/.describe/variables.js

@@ -1,10 +1,10 @@
 'use strict'
 
 function addVariables (composition, variables) {
-  const used = new Set()
-
   composition.variables ??= []
 
+  const used = new Set(composition.variables.map((variable) => variable.name))
+
   for (const [key, set] of Object.entries(variables)) {
     if (key !== 'global' && !composition.components?.includes(key))
       continue

package/src/deployment/.deployment/describe.js

@@ -21,7 +21,7 @@ const describe = (context, compositions, dependency) => {
   const credentials = context.registry?.credentials
 
   desc.compositions(compositions, dependency)
-  desc.services(services, dependency.variables)
+  desc.services(services, dependency.variables, dependency.probe)
 
   return {
     compositions,

package/src/deployment/.deployment/merge.js

@@ -15,15 +15,19 @@ const merge = (dependencies) => {
 
   const mounts = {}
 
+  /** @type {toa.deployment.dependency.Probe | false | undefined} */
+  let probe
+
   for (const dependency of dependencies) {
     if (dependency.references !== undefined) references.push(...dependency.references)
     if (dependency.services !== undefined) services.push(...dependency.services)
     if (dependency.proxies !== undefined) proxies.push(...dependency.proxies)
     if (dependency.variables !== undefined) append(variables, dependency.variables)
     if (dependency.mounts !== undefined) append(mounts, dependency.mounts)
+    if (dependency.probe !== undefined) probe = dependency.probe
   }
 
-  return { references, services, proxies, variables, mounts }
+  return { references, services, proxies, variables, mounts, probe }
 }
 
 const append = (merged, variables) => {

package/src/deployment/chart/templates/compositions.yaml

@@ -47,6 +47,27 @@ spec:
             {{- include "env.var" . | indent 12 }}
             {{- end }}
           {{- end }}
+          {{- if .probe }}
+          ports:
+            - containerPort: {{ .probe.port }}
+          startupProbe:
+            httpGet:
+              path: {{ .probe.path }}
+              port: {{ .probe.port }}
+            {{- if .probe.delay }}
+            initialDelaySeconds: {{ .probe.delay }}
+            {{- end }}
+            periodSeconds: 2
+            timeoutSeconds: 3
+            failureThreshold: 150
+          readinessProbe:
+            httpGet:
+              path: {{ .probe.path }}
+              port: {{ .probe.port }}
+            periodSeconds: 10
+            timeoutSeconds: 3
+            failureThreshold: 3
+          {{- end }}
           {{- if .mounts }}
           volumeMounts:
             {{- range .mounts }}
@@ -54,6 +75,11 @@ spec:
               mountPath: {{ .path }}
             {{- end }}
           {{- end }}
+          lifecycle:
+            preStop:
+              exec:
+                command: [sleep, "5"]
+      terminationGracePeriodSeconds: 45
       {{- if $.Values.credentials }}
       imagePullSecrets:
         - name: {{ $.Values.credentials }}

package/types/dependency.ts

@@ -10,7 +10,7 @@ export interface Service {
   resources?: Resources
   variables?: Variable[]
   components?: string[]
-  probe?: Probe
+  probe?: Probe | false
 }
 
 export interface Variable {
@@ -38,6 +38,8 @@ export interface Dependency {
   services?: Service[]
   variables?: Variables
   mounts?: Mounts
+  /** Default probe for compositions and services without their own probe. `false` disables. */
+  probe?: Probe | false
 }
 
 interface Ingress {
@@ -47,7 +49,7 @@ interface Ingress {
   annotations?: object
 }
 
-interface Probe {
+export interface Probe {
   port: number
   path: string
   delay?: number