@toa.io/operations 1.0.0-alpha.70 → 1.0.0-alpha.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/operations",
-  "version": "1.0.0-alpha.70",
+  "version": "1.0.0-alpha.73",
   "description": "Toa Deployment",
   "homepage": "https://toa.io",
   "author": {
@@ -29,10 +29,10 @@
   "dependencies": {
     "@toa.io/filesystem": "1.0.0-alpha.63",
     "@toa.io/generic": "1.0.0-alpha.63",
-    "@toa.io/norm": "1.0.0-alpha.67",
+    "@toa.io/norm": "1.0.0-alpha.73",
     "@toa.io/yaml": "1.0.0-alpha.63",
     "execa": "5.1.1",
     "fs-extra": "11.1.1"
   },
-  "gitHead": "3fe12fa8b6a82fecc9205e9f6dd4b39e03184c7b"
+  "gitHead": "3c7d415c68324aae8f1524b2ae06b02eb5832c54"
 }

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

@@ -75,6 +75,17 @@ spec:
                 port:
                   number: 8000
     {{- end }}
+    {{- if .ingress.default }}
+    - http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: extension-{{ $service }}
+                port:
+                  number: 8000
+    {{- end }}
 {{- end }}
 ---
 {{- end }}

package/src/deployment/chart/values.yaml

@@ -32,6 +32,7 @@ services:
     port: 8000
     replicas: 2
     ingress:
+      default: true
       hosts: [dummies.toa.io]
       class: alb
       annotations:

package/src/deployment/deployment.js

@@ -42,6 +42,7 @@ class Deployment {
 
     if (options.namespace !== undefined) args.push('-n', options.namespace)
     if (options.wait === true) args.push('--wait')
+    if (options.timeout !== undefined) args.push('--timeout', options.timeout)
 
     await this.#process.execute('helm', ['dependency', 'update', this.#target])
     await this.#process.execute('helm', ['upgrade', this.#chart.name, '-i', ...args, this.#target])

package/src/deployment/images/composition.Dockerfile

@@ -16,4 +16,4 @@ COPY --chown=node:node . /composition
 RUN for entry in *; do if [ -f "$entry/package.json" ]; then (cd $entry && npm i --omit=dev); fi; done
 
 USER node
-CMD toa compose *
+CMD ["toa", "compose", "*"]

package/src/deployment/images/service.Dockerfile

@@ -11,4 +11,4 @@ COPY --chown=node:node . /service
 RUN npm i --omit=dev
 
 USER node
-CMD toa serve .
+CMD ["toa", "serve", "."]

package/src/deployment/registry.js

@@ -74,6 +74,11 @@ class Registry {
    * @returns {Promise<void>}
    */
   async #build (image, push = false) {
+    if (await this.exists(image.reference)) {
+      console.log('Image already exists, skipping:', image.reference)
+      return
+    }
+
     const args = ['--context=default', 'buildx', 'build']
 
     if (push) {
@@ -96,7 +101,6 @@ class Registry {
 
       args.push('--platform', platform)
       args.push('--builder', builder)
-
     } else {
       args.push('--builder', 'default')
     }
@@ -110,6 +114,18 @@ class Registry {
     await this.#build(image, true)
   }
 
+  async exists (tag) {
+    const args = ['inspect', tag]
+
+    try {
+      await this.#process.execute('docker', args, { silently: true })
+    } catch {
+      return false
+    }
+
+    return true
+  }
+
   async #createBuilder () {
     const name = `toa-${newid()}`
     const create = `buildx create --name ${name} --bootstrap --use`.split(' ')

package/types/_deployment/images/image.d.ts

@@ -4,9 +4,11 @@ declare namespace toa.deployment.images {
     readonly reference: string
     readonly context: string
 
-    tag(): void
+    name: string
 
-    prepare(root: string): Promise<string>
+    tag (): void
+
+    prepare (root: string): Promise<string>
   }
 
 }

package/types/dependency.ts

@@ -40,7 +40,8 @@ export interface Dependency {
 }
 
 interface Ingress {
-  hosts: string[]
+  default?: boolean
+  hosts?: string[]
   class?: string
   annotations?: object
 }