@toa.io/operations 1.0.0-alpha.55 → 1.0.0-alpha.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.0-alpha.58",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -22,17 +22,17 @@
     "access": "public"
   },
   "main": "src/index.js",
-  "types": "types/index.d.ts",
+  "types": "types/index.ts",
   "scripts": {
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/filesystem": "1.0.0-alpha.55",
-    "@toa.io/generic": "1.0.0-alpha.55",
-    "@toa.io/norm": "1.0.0-alpha.55",
-    "@toa.io/yaml": "1.0.0-alpha.55",
+    "@toa.io/filesystem": "1.0.0-alpha.56",
+    "@toa.io/generic": "1.0.0-alpha.56",
+    "@toa.io/norm": "1.0.0-alpha.58",
+    "@toa.io/yaml": "1.0.0-alpha.56",
     "execa": "5.1.1",
     "fs-extra": "11.1.1"
   },
-  "gitHead": "39465f6af0009b07fd800c5b97244fadd6d3afe6"
+  "gitHead": "f8ec99fc117db7ac763375249b11f74f84a5db48"
 }

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

@@ -1,10 +1,12 @@
 'use strict'
 
 const { addVariables } = require('./variables')
+const { addMounts } = require('./mounts')
 
-function compositions (compositions, variables) {
+function compositions (compositions, dependency) {
   for (const composition of compositions) {
-    addVariables(composition, variables)
+    addVariables(composition, dependency.variables)
+    addMounts(composition, dependency.mounts)
   }
 }
 

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

@@ -0,0 +1,24 @@
+'use strict'
+
+function addMounts (composition, mounts) {
+  if (mounts === undefined)
+    return
+
+  const used = new Set()
+
+  for (const [key, mount] of Object.entries(mounts)) {
+    if (key !== 'global' && !composition.components?.includes(key))
+      continue
+
+    for (const { name, path, claim } of mount) {
+      if (used.has(name))
+        continue
+
+      composition.mounts ??= []
+      composition.mounts.push({ name, path, claim })
+      used.add(name)
+    }
+  }
+}
+
+exports.addMounts = addMounts

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

@@ -1,17 +1,18 @@
 'use strict'
 
-function addVariables (deployment, variables) {
+function addVariables (composition, variables) {
   const used = new Set()
 
-  deployment.variables ??= []
+  composition.variables ??= []
 
   for (const [key, set] of Object.entries(variables)) {
-    if (key !== 'global' && !deployment.components?.includes(key)) continue
+    if (key !== 'global' && !composition.components?.includes(key))
+      continue
 
     for (const variable of set) {
       if (used.has(variable.name)) continue
 
-      deployment.variables.push(variable)
+      composition.variables.push(variable)
       used.add(variable.name)
     }
   }

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const get = require('./.describe')
+const desc = require('./.describe')
 
 const describe = (context, compositions, dependency) => {
   const { services } = dependency
@@ -17,11 +17,11 @@ const describe = (context, compositions, dependency) => {
     }
   )
 
-  const components = get.components(compositions)
+  const components = desc.components(compositions)
   const credentials = context.registry?.credentials
 
-  get.compositions(compositions, dependency.variables, context.environment)
-  get.services(services, dependency.variables)
+  desc.compositions(compositions, dependency)
+  desc.services(services, dependency.variables)
 
   return {
     compositions,

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

@@ -13,14 +13,17 @@ const merge = (dependencies) => {
   /** @type {toa.deployment.dependency.Variables} */
   const variables = {}
 
+  const mounts = {}
+
   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)
   }
 
-  return { references, services, proxies, variables }
+  return { references, services, proxies, variables, mounts }
 }
 
 const append = (merged, variables) => {

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

@@ -25,9 +25,24 @@ spec:
             {{- include "env.var" . | indent 12 }}
             {{- end }}
           {{- end }}
+          {{- if .mounts }}
+          volumeMounts:
+            {{- range .mounts }}
+            - name: {{ .name }}
+              mountPath: {{ .path }}
+            {{- end }}
+          {{- end }}
       {{- if $.Values.credentials }}
       imagePullSecrets:
         - name: {{ $.Values.credentials }}
       {{- end }}
+      {{- if .mounts }}
+      volumes:
+        {{- range .mounts }}
+        - name: {{ .name }}
+          persistentVolumeClaim:
+            claimName: {{ .claim }}
+        {{- end }}
+      {{- end }}
 ---
 {{- end }}

package/src/deployment/chart/values.yaml

@@ -3,6 +3,10 @@ compositions:
   - name: todos
     image: localhost:5000/composition-todos:0.0.0
     replicas: 2
+    mounts:
+      - name: mount-name
+        path: /storage
+        claim: storage-pvc
     components:
       - todos-tasks
       - todos-stats
@@ -18,7 +22,6 @@ compositions:
     replicas: 3
     components:
       - users-users
-# TODO: create component services only if sync binding is being used
 components:
   - todos-tasks
   - todos-stats

package/types/{dependency.d.ts → dependency.ts}

@@ -1,4 +1,4 @@
-export type Service = {
+export interface Service {
   group: string
   name: string
   version: string
@@ -9,24 +9,26 @@ export type Service = {
   probe?: Probe
 }
 
-export type Variable = {
+export interface Variable {
   name: string
   value?: string
   secret?: {
-    name: string,
+    name: string
     key: string
     optional?: boolean
   }
 }
 
 export type Variables = Record<'global' | string, Variable[]>
+export type Mounts = Record<'global' | string, Mount[]>
 
-export type Dependency = {
+export interface Dependency {
   services?: Service[]
   variables?: Variables
+  mounts?: Mounts
 }
 
-type Ingress = {
+interface Ingress {
   hosts: string[]
   class?: string
   annotations?: object
@@ -37,3 +39,9 @@ interface Probe {
   path: string
   delay?: number
 }
+
+interface Mount {
+  name: string
+  path: string
+  claim: string
+}