From e7e50e40bb977f5566a9de96d7abbefd2e7daaea Mon Sep 17 00:00:00 2001 From: Blayne Chard Date: Mon, 6 Nov 2023 12:09:58 +1300 Subject: [PATCH 1/2] feat: add argo schema url for all argo docs --- templates/argo-tasks/copy.yml | 3 +++ templates/argo-tasks/create-manifest.yml | 3 +++ templates/argo-tasks/group.yml | 3 +++ templates/argo-tasks/push-to-github.yml | 2 ++ templates/argo-tasks/tile-index-validate.yml | 3 +++ workflows/basemaps/create-config.yaml | 4 +++- workflows/basemaps/create-overview-all.yaml | 4 +++- workflows/basemaps/create-overview.yaml | 4 +++- workflows/basemaps/imagery-import-cogify.yml | 7 +++++-- workflows/basemaps/imagery-import.yaml | 13 ++++++++----- workflows/basemaps/mapsheet-json.yaml | 3 +++ workflows/basemaps/vector-etl.yaml | 10 ++++++---- workflows/imagery/ascii-standardise-publish.yaml | 5 +++-- workflows/imagery/publish-copy.yaml | 5 ++++- workflows/imagery/publish-odr.yaml | 4 +++- workflows/imagery/standardising-publish-import.yaml | 4 +++- workflows/imagery/standardising.yaml | 8 +++++--- workflows/imagery/tests.yaml | 3 +++ workflows/test/env.yaml | 2 ++ workflows/test/flatten.yaml | 4 +++- workflows/test/list.arm.yaml | 3 +++ workflows/test/list.yaml | 3 +++ workflows/test/sleep.yml | 4 +++- 23 files changed, 80 insertions(+), 24 deletions(-) diff --git a/templates/argo-tasks/copy.yml b/templates/argo-tasks/copy.yml index 952e623af..770c8c82f 100644 --- a/templates/argo-tasks/copy.yml +++ b/templates/argo-tasks/copy.yml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -8,6 +10,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' entrypoint: main templates: - name: main diff --git a/templates/argo-tasks/create-manifest.yml b/templates/argo-tasks/create-manifest.yml index b796ab420..06ddbd5ed 100644 --- a/templates/argo-tasks/create-manifest.yml +++ b/templates/argo-tasks/create-manifest.yml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -8,6 +10,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' entrypoint: main templates: - name: main diff --git a/templates/argo-tasks/group.yml b/templates/argo-tasks/group.yml index 58af7e745..5e1701fae 100644 --- a/templates/argo-tasks/group.yml +++ b/templates/argo-tasks/group.yml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -8,6 +10,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' entrypoint: main templates: - name: main diff --git a/templates/argo-tasks/push-to-github.yml b/templates/argo-tasks/push-to-github.yml index 64bb59cae..adec1a3d5 100644 --- a/templates/argo-tasks/push-to-github.yml +++ b/templates/argo-tasks/push-to-github.yml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -8,6 +9,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' entrypoint: main templates: - name: main diff --git a/templates/argo-tasks/tile-index-validate.yml b/templates/argo-tasks/tile-index-validate.yml index 76235eacf..90d27a42c 100644 --- a/templates/argo-tasks/tile-index-validate.yml +++ b/templates/argo-tasks/tile-index-validate.yml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -8,6 +10,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' entrypoint: main templates: - name: main diff --git a/workflows/basemaps/create-config.yaml b/workflows/basemaps/create-config.yaml index 665df9107..213b30014 100644 --- a/workflows/basemaps/create-config.yaml +++ b/workflows/basemaps/create-config.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -15,6 +16,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/basemaps/create-overview-all.yaml b/workflows/basemaps/create-overview-all.yaml index 15f563677..dbcc27877 100644 --- a/workflows/basemaps/create-overview-all.yaml +++ b/workflows/basemaps/create-overview-all.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -16,6 +17,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/basemaps/create-overview.yaml b/workflows/basemaps/create-overview.yaml index 38fe1e949..b92046296 100644 --- a/workflows/basemaps/create-overview.yaml +++ b/workflows/basemaps/create-overview.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -17,6 +18,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/basemaps/imagery-import-cogify.yml b/workflows/basemaps/imagery-import-cogify.yml index 3d36f2a7c..8c569e7ed 100644 --- a/workflows/basemaps/imagery-import-cogify.yml +++ b/workflows/basemaps/imagery-import-cogify.yml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -14,6 +16,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' arguments: parameters: - name: version_basemaps_cli @@ -66,11 +69,11 @@ spec: - name: cutline_blend description: Blending to use for cutline see gdal_translate#cblend - value: 20 + value: '20' - name: group_size description: How many items to pass to each create-cog job - value: 20 + value: '20' templates: # Main entrypoint into the workflow diff --git a/workflows/basemaps/imagery-import.yaml b/workflows/basemaps/imagery-import.yaml index bf0e8dc2a..32c5526f3 100644 --- a/workflows/basemaps/imagery-import.yaml +++ b/workflows/basemaps/imagery-import.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -37,14 +39,14 @@ spec: - name: cutline value: 's3://linz-basemaps-source/cutline/2020-05-07-cutline-nz-coasts-rural-and-urban.geojson' - name: blend - value: 20 + value: '20' - name: aligned-level - value: 6 + value: '6' - name: create-pull-request - value: true + value: 'true' enum: - - true - - false + - 'true' + - 'false' volumes: - name: secret-vol @@ -54,6 +56,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main inputs: diff --git a/workflows/basemaps/mapsheet-json.yaml b/workflows/basemaps/mapsheet-json.yaml index d9664e13d..b0dfefe42 100644 --- a/workflows/basemaps/mapsheet-json.yaml +++ b/workflows/basemaps/mapsheet-json.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -22,6 +24,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/basemaps/vector-etl.yaml b/workflows/basemaps/vector-etl.yaml index 1f7b6adac..7c1ae540a 100644 --- a/workflows/basemaps/vector-etl.yaml +++ b/workflows/basemaps/vector-etl.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -17,13 +18,14 @@ spec: - 'linz-basemaps' - 'linz-basemaps-staging' - name: create-pull-request - value: true + value: 'true' enum: - - true - - false + - 'true' + - 'false' templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/imagery/ascii-standardise-publish.yaml b/workflows/imagery/ascii-standardise-publish.yaml index ed629475c..c9b3f84a8 100644 --- a/workflows/imagery/ascii-standardise-publish.yaml +++ b/workflows/imagery/ascii-standardise-publish.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -49,6 +50,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: @@ -113,7 +115,6 @@ spec: path: '/tmp/location' - name: aws-list - inputs: container: image: '019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{workflow.parameters.version-argo-tasks}}' command: [node, /app/index.js] diff --git a/workflows/imagery/publish-copy.yaml b/workflows/imagery/publish-copy.yaml index 5e287bff5..772e2f355 100644 --- a/workflows/imagery/publish-copy.yaml +++ b/workflows/imagery/publish-copy.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -39,6 +40,8 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' + templates: - name: main inputs: diff --git a/workflows/imagery/publish-odr.yaml b/workflows/imagery/publish-odr.yaml index b957d00d3..42a4c408c 100644 --- a/workflows/imagery/publish-odr.yaml +++ b/workflows/imagery/publish-odr.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -39,6 +40,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main inputs: diff --git a/workflows/imagery/standardising-publish-import.yaml b/workflows/imagery/standardising-publish-import.yaml index 59ae3d711..04874b82c 100644 --- a/workflows/imagery/standardising-publish-import.yaml +++ b/workflows/imagery/standardising-publish-import.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -49,6 +50,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main steps: diff --git a/workflows/imagery/standardising.yaml b/workflows/imagery/standardising.yaml index d80a089b4..d2606dfcf 100644 --- a/workflows/imagery/standardising.yaml +++ b/workflows/imagery/standardising.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -38,12 +39,12 @@ spec: - '50000' - 'None' - name: validate - value: true + value: 'true' enum: - 'false' - 'true' - name: retile - value: false + value: 'false' enum: - 'true' - 'false' @@ -210,6 +211,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main inputs: diff --git a/workflows/imagery/tests.yaml b/workflows/imagery/tests.yaml index 6ceca8679..5bcafa0c0 100644 --- a/workflows/imagery/tests.yaml +++ b/workflows/imagery/tests.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -14,6 +16,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: test-script script: diff --git a/workflows/test/env.yaml b/workflows/test/env.yaml index 836ddf7d1..77ffbacd3 100644 --- a/workflows/test/env.yaml +++ b/workflows/test/env.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: diff --git a/workflows/test/flatten.yaml b/workflows/test/flatten.yaml index 9d2b13440..a87b4efa7 100644 --- a/workflows/test/flatten.yaml +++ b/workflows/test/flatten.yaml @@ -1,4 +1,5 @@ ---- +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: @@ -25,6 +26,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + iamge: '' templates: - name: main dag: diff --git a/workflows/test/list.arm.yaml b/workflows/test/list.arm.yaml index b2e5d1181..64f672c8d 100644 --- a/workflows/test/list.arm.yaml +++ b/workflows/test/list.arm.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + # Example of using ARM + Spot instances for processing apiVersion: argoproj.io/v1alpha1 kind: Workflow @@ -17,6 +19,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/test/list.yaml b/workflows/test/list.yaml index 0dc7744b6..15495a71f 100644 --- a/workflows/test/list.yaml +++ b/workflows/test/list.yaml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -14,6 +16,7 @@ spec: templateDefaults: container: imagePullPolicy: Always + image: '' templates: - name: main dag: diff --git a/workflows/test/sleep.yml b/workflows/test/sleep.yml index 0c06e47d5..904766db4 100644 --- a/workflows/test/sleep.yml +++ b/workflows/test/sleep.yml @@ -1,3 +1,5 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/argoproj/argo-workflows/v3.4.13/api/jsonschema/schema.json + apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: @@ -13,5 +15,5 @@ spec: requests: memory: 3.9Gi cpu: 2000m - image: ubuntu:22.04 + image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:latest command: ['sleep', '3600'] From a2dcb9c6ecfafb5081b4b7761526b8dfe9f116de Mon Sep 17 00:00:00 2001 From: Blayne Chard Date: Mon, 6 Nov 2023 13:39:55 +1300 Subject: [PATCH 2/2] refactor: correct typo --- workflows/test/flatten.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/test/flatten.yaml b/workflows/test/flatten.yaml index a87b4efa7..9d5e28873 100644 --- a/workflows/test/flatten.yaml +++ b/workflows/test/flatten.yaml @@ -26,7 +26,7 @@ spec: templateDefaults: container: imagePullPolicy: Always - iamge: '' + image: '' templates: - name: main dag: