From 70addbec57caea453020f67ea15d618dae9f22f8 Mon Sep 17 00:00:00 2001 From: Paul Fouquet Date: Wed, 3 Apr 2024 12:35:26 +1300 Subject: [PATCH] feat: default retryStrategy TDE-1112 --- infra/charts/argo.workflows.ts | 2 ++ templates/argo-tasks/copy.yml | 2 -- templates/argo-tasks/push-to-github.yml | 2 -- workflows/basemaps/create-config.yaml | 2 -- workflows/basemaps/create-overview-all.yaml | 2 -- workflows/basemaps/create-overview.yaml | 2 -- workflows/basemaps/imagery-import-cogify.yml | 8 -------- workflows/raster/standardising.yaml | 8 -------- workflows/stac/stac-validate.yaml | 2 -- workflows/test/flatten.yaml | 2 -- workflows/util/create-thumbnails.yaml | 2 -- 11 files changed, 2 insertions(+), 32 deletions(-) diff --git a/infra/charts/argo.workflows.ts b/infra/charts/argo.workflows.ts index 52dd2fdd5..59f76de3b 100644 --- a/infra/charts/argo.workflows.ts +++ b/infra/charts/argo.workflows.ts @@ -147,6 +147,8 @@ export class ArgoWorkflows extends Chart { }, ], parallelism: 3, + // FIXME: `nodeAntiAffinity` - to retry on different node - is not working yet (https://github.com/argoproj/argo-workflows/pull/12701) + retryStrategy: { limit: 2, affinity: { nodeAntiAffinity: {} } }, }, }, }, diff --git a/templates/argo-tasks/copy.yml b/templates/argo-tasks/copy.yml index 8cadec150..246141961 100644 --- a/templates/argo-tasks/copy.yml +++ b/templates/argo-tasks/copy.yml @@ -14,8 +14,6 @@ spec: entrypoint: main templates: - name: main - retryStrategy: - limit: '2' inputs: parameters: - name: file diff --git a/templates/argo-tasks/push-to-github.yml b/templates/argo-tasks/push-to-github.yml index ec0bd54e4..29d7eb3e0 100644 --- a/templates/argo-tasks/push-to-github.yml +++ b/templates/argo-tasks/push-to-github.yml @@ -13,8 +13,6 @@ spec: entrypoint: main templates: - name: main - retryStrategy: - limit: '2' inputs: parameters: - name: source diff --git a/workflows/basemaps/create-config.yaml b/workflows/basemaps/create-config.yaml index d0f97a920..c35546a0b 100644 --- a/workflows/basemaps/create-config.yaml +++ b/workflows/basemaps/create-config.yaml @@ -30,8 +30,6 @@ spec: - name: location value: '{{workflow.parameters.location}}' - name: create-config - retryStrategy: - limit: '2' inputs: parameters: - name: location diff --git a/workflows/basemaps/create-overview-all.yaml b/workflows/basemaps/create-overview-all.yaml index 05136adc8..30d7cb53f 100644 --- a/workflows/basemaps/create-overview-all.yaml +++ b/workflows/basemaps/create-overview-all.yaml @@ -51,8 +51,6 @@ spec: path: '/tmp/imagery.json' - name: create-overview - retryStrategy: - limit: '2' inputs: parameters: - name: source diff --git a/workflows/basemaps/create-overview.yaml b/workflows/basemaps/create-overview.yaml index b5cc0a5c0..f1c9110e9 100644 --- a/workflows/basemaps/create-overview.yaml +++ b/workflows/basemaps/create-overview.yaml @@ -35,8 +35,6 @@ spec: - name: output value: '{{workflow.parameters.output}}' - name: create-overview - retryStrategy: - limit: '2' inputs: parameters: - name: source diff --git a/workflows/basemaps/imagery-import-cogify.yml b/workflows/basemaps/imagery-import-cogify.yml index a8e938265..c40f2fa75 100644 --- a/workflows/basemaps/imagery-import-cogify.yml +++ b/workflows/basemaps/imagery-import-cogify.yml @@ -239,8 +239,6 @@ spec: # Generate a tile covering for input imagery - name: create-covering - retryStrategy: - limit: '2' nodeSelector: karpenter.sh/capacity-type: 'spot' inputs: @@ -284,8 +282,6 @@ spec: # Actually create COGs using gdal_translate on a large spot instances - name: create-cog - retryStrategy: - limit: '2' nodeSelector: karpenter.sh/capacity-type: 'spot' inputs: @@ -312,8 +308,6 @@ spec: # Create a basemaps configuration file to view the imagery - name: create-config - retryStrategy: - limit: '2' inputs: parameters: - name: path @@ -340,8 +334,6 @@ spec: # create additional overviews for any COGs found in the path - name: create-overview - retryStrategy: - limit: '2' nodeSelector: karpenter.sh/capacity-type: 'spot' inputs: diff --git a/workflows/raster/standardising.yaml b/workflows/raster/standardising.yaml index f9f4abaca..2ac87be0c 100644 --- a/workflows/raster/standardising.yaml +++ b/workflows/raster/standardising.yaml @@ -441,8 +441,6 @@ spec: path: '/tmp/collection-id' - name: standardise-validate - retryStrategy: - limit: '2' nodeSelector: karpenter.sh/capacity-type: 'spot' inputs: @@ -489,8 +487,6 @@ spec: - '{{=sprig.trim(workflow.parameters.gsd)}}' - name: create-collection - retryStrategy: - limit: '2' nodeSelector: karpenter.sh/capacity-type: 'spot' inputs: @@ -582,8 +578,6 @@ spec: path: '/tmp/key' - name: create-overview - retryStrategy: - limit: '2' inputs: parameters: - name: location @@ -608,8 +602,6 @@ spec: ] - name: create-config - retryStrategy: - limit: '2' inputs: parameters: - name: location diff --git a/workflows/stac/stac-validate.yaml b/workflows/stac/stac-validate.yaml index 6be391533..23c46b88d 100644 --- a/workflows/stac/stac-validate.yaml +++ b/workflows/stac/stac-validate.yaml @@ -68,8 +68,6 @@ spec: valueFrom: path: /tmp/file_list.json - name: stac-validate-collections - retryStrategy: - limit: '2' inputs: parameters: - name: file diff --git a/workflows/test/flatten.yaml b/workflows/test/flatten.yaml index 967c63552..4ecfdcc08 100644 --- a/workflows/test/flatten.yaml +++ b/workflows/test/flatten.yaml @@ -80,8 +80,6 @@ spec: valueFrom: path: /tmp/file_list.json - name: flatten-copy - retryStrategy: - limit: '2' inputs: parameters: - name: file diff --git a/workflows/util/create-thumbnails.yaml b/workflows/util/create-thumbnails.yaml index bcc49dc90..be1736722 100644 --- a/workflows/util/create-thumbnails.yaml +++ b/workflows/util/create-thumbnails.yaml @@ -75,8 +75,6 @@ spec: path: /tmp/file_list.json - name: thumbnails - retryStrategy: - limit: '2' nodeSelector: karpenter.sh/capacity-type: 'spot' inputs: