fix: find and replace eks:

linz · Oct 4, 2023 · a89c683 · a89c683
1 parent 1d4739d
commit a89c683
Show file tree

Hide file tree

Showing 25 changed files with 43 additions and 43 deletions.
diff --git a/CONFIGURATION.md b/CONFIGURATION.md
@@ -73,7 +73,7 @@ Environment variables can be set in the containers as below, which is setting th
 
 ```yaml
 container:
-  image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-latest
+  image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:latest
   command: [node, /app/index.js]
   env:
     - name: AWS_ROLE_CONFIG_PATH
@@ -130,7 +130,7 @@ Two example workflow tasks requesting specific resources (memory and CPU) from t
       - name: file
       - name: collection-id
   container:
-    image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-latest
+    image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:latest
     resources:
       requests:
         memory: 7.8Gi
@@ -149,7 +149,7 @@ Two example workflow tasks requesting specific resources (memory and CPU) from t
     parameters:
       - name: file
   container:
-    image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-latest
+    image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:latest
     resources:
       requests:
         memory: 7.8Gi

diff --git a/docs/training_workshop/ARGO_WORKFLOWS.md b/docs/training_workshop/ARGO_WORKFLOWS.md
@@ -129,7 +129,7 @@ spec:
             template: say-hello-template
     - name: say-hello-template
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["hello world"]
 ```
@@ -211,7 +211,7 @@ spec:
         parameters:
           - name: message
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["{{inputs.parameters.message}}"]
 ```
@@ -372,7 +372,7 @@ spec:
         parameters:
           - name: message
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["{{inputs.parameters.message}}"]
 ```
@@ -443,7 +443,7 @@ spec:
         parameters:
           - name: message
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["{{inputs.parameters.message}}"]
 ```
@@ -514,7 +514,7 @@ spec:
           - name: uri
           - name: include
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:v2"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -541,7 +541,7 @@ spec:
         parameters:
           - name: file
       script:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:v2"
         env:
           - name: AWS_ROLE_CONFIG_PATH
             value: s3://linz-bucket-config/config.json

diff --git a/docs/training_workshop/example_workflows/wf_hello_world.yaml b/docs/training_workshop/example_workflows/wf_hello_world.yaml
@@ -16,6 +16,6 @@ spec:
             template: say-hello-template
     - name: say-hello-template
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["hello world"]
diff --git a/docs/training_workshop/example_workflows/wf_hello_world_args.yaml b/docs/training_workshop/example_workflows/wf_hello_world_args.yaml
@@ -27,6 +27,6 @@ spec:
         parameters:
           - name: message
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["{{inputs.parameters.message}}"]
diff --git a/docs/training_workshop/example_workflows/wf_hello_world_args_tasks.yaml b/docs/training_workshop/example_workflows/wf_hello_world_args_tasks.yaml
@@ -35,6 +35,6 @@ spec:
         parameters:
           - name: message
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["{{inputs.parameters.message}}"]
diff --git a/docs/training_workshop/example_workflows/wf_hello_world_dag.yaml b/docs/training_workshop/example_workflows/wf_hello_world_dag.yaml
@@ -50,6 +50,6 @@ spec:
         parameters:
           - name: message
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:v2"
         command: [echo]
         args: ["{{inputs.parameters.message}}"]
diff --git a/docs/training_workshop/example_workflows/wf_output_parallel.yaml b/docs/training_workshop/example_workflows/wf_output_parallel.yaml
@@ -42,7 +42,7 @@ spec:
           - name: uri
           - name: include
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:v2"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -69,7 +69,7 @@ spec:
         parameters:
           - name: file
       script:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-v2"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:v2"
         env:
           - name: AWS_ROLE_CONFIG_PATH
             value: s3://linz-bucket-config/config.json

diff --git a/templates/argo-tasks/README.md b/templates/argo-tasks/README.md
@@ -68,7 +68,7 @@ steps:
     - name: group_id # "000", "001" ... etc
 
   script:
-    image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-latest"
+    image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:latest"
     command: [bash]
     source: |
       echo {{ inputs.parameters.group_id}}

diff --git a/templates/argo-tasks/copy.yml b/templates/argo-tasks/copy.yml
@@ -35,7 +35,7 @@ spec:
             default: "s3://linz-bucket-config/config-write.imagery.json,s3://linz-bucket-config/config-write.elevation.json,s3://linz-bucket-config/config-write.topographic.json"
 
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         resources:
           requests:
             memory: 7.8Gi

diff --git a/templates/argo-tasks/create-manifest.yml b/templates/argo-tasks/create-manifest.yml
@@ -58,7 +58,7 @@ spec:
               path: /tmp/file_list.json
 
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(inputs.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(inputs.parameters['version-argo-tasks'])}}"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH

diff --git a/templates/argo-tasks/group.yml b/templates/argo-tasks/group.yml
@@ -57,7 +57,7 @@ spec:
             path: /tmp/group/output/
 
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{= inputs.parameters.version }}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{= inputs.parameters.version }}"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH

diff --git a/templates/argo-tasks/push-to-github.yml b/templates/argo-tasks/push-to-github.yml
@@ -33,7 +33,7 @@ spec:
               - "imagery"
 
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(inputs.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(inputs.parameters['version-argo-tasks'])}}"
         env:
           - name: AWS_ROLE_CONFIG_PATH
             value: s3://linz-bucket-config/config.json

diff --git a/templates/argo-tasks/tile-index-validate.yml b/templates/argo-tasks/tile-index-validate.yml
@@ -64,7 +64,7 @@ spec:
               none: {}
 
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=inputs.parameters.version}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=inputs.parameters.version}}"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH

diff --git a/workflows/basemaps/imagery-import-cogify.yml b/workflows/basemaps/imagery-import-cogify.yml
@@ -323,7 +323,7 @@ spec:
         parameters:
           - name: target
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{workflow.parameters.version_argo_tasks}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{workflow.parameters.version_argo_tasks}}
         volumeMounts:
           - name: secret-vol
             mountPath: "/root/.ssh/"

diff --git a/workflows/basemaps/mapsheet-json.yaml b/workflows/basemaps/mapsheet-json.yaml
@@ -52,7 +52,7 @@ spec:
         parameters:
           - name: layer
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}
         command: [node, index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH

diff --git a/workflows/basemaps/vector-etl.yaml b/workflows/basemaps/vector-etl.yaml
@@ -70,7 +70,7 @@ spec:
         parameters:
           - name: target
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{workflow.parameters.version_argo_tasks}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{workflow.parameters.version_argo_tasks}}
         volumeMounts:
           - name: secret-vol
             mountPath: "/root/.ssh/"

diff --git a/workflows/imagery/ascii-standardise-publish.yaml b/workflows/imagery/ascii-standardise-publish.yaml
@@ -99,7 +99,7 @@ spec:
 
     - name: get-location
       script:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         command: [node]
         source: |
           const fs = require('fs');
@@ -115,7 +115,7 @@ spec:
     - name: aws-list
       inputs:
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{workflow.parameters.version-argo-tasks}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{workflow.parameters.version-argo-tasks}}"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -149,7 +149,7 @@ spec:
           - name: files
             path: /tmp/file_list.json
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
         resources:
           requests:
             memory: 7.8Gi

diff --git a/workflows/imagery/standardising.yaml b/workflows/imagery/standardising.yaml
@@ -324,7 +324,7 @@ spec:
 
     - name: collection-id-setup
       script:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
         command: [python]
         source: |
           import ulid
@@ -354,7 +354,7 @@ spec:
           - name: group_data
             path: /tmp/input/
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
         resources:
           requests:
             memory: 7.8Gi
@@ -396,7 +396,7 @@ spec:
           - name: collection-id
           - name: location
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
         resources:
           requests:
             memory: 7.8Gi
@@ -429,7 +429,7 @@ spec:
         parameters:
           - name: location
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -444,7 +444,7 @@ spec:
 
     - name: get-location
       script:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         command: [node]
         source: |
           const fs = require('fs');

diff --git a/workflows/imagery/tests.yaml b/workflows/imagery/tests.yaml
@@ -17,7 +17,7 @@ spec:
   templates:
     - name: test-script
       script:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-{{workflow.parameters.version-topo-imagery}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:{{workflow.parameters.version-topo-imagery}}
         command: [python]
         source: |
           import sys

diff --git a/workflows/stac/stac-validate.yaml b/workflows/stac/stac-validate.yaml
@@ -43,7 +43,7 @@ spec:
             withParam: "{{tasks.aws-list-collections.outputs.parameters.files}}"
     - name: aws-list-collections
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -72,7 +72,7 @@ spec:
         parameters:
           - name: file
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         resources:
           requests:
             cpu: 15000m

diff --git a/workflows/test/env.yaml b/workflows/test/env.yaml
@@ -7,5 +7,5 @@ spec:
   templates:
     - name: env
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-latest
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:latest
         command: [env]
diff --git a/workflows/test/flatten.yaml b/workflows/test/flatten.yaml
@@ -51,7 +51,7 @@ spec:
           - name: uri
           - name: filter
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -82,7 +82,7 @@ spec:
         parameters:
           - name: file
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}
         resources:
           requests:
             memory: 7.8Gi

diff --git a/workflows/test/list.yaml b/workflows/test/list.yaml
@@ -32,7 +32,7 @@ spec:
           - name: uri
           - name: include
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{workflow.parameters.version-argo-tasks}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{workflow.parameters.version-argo-tasks}}
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH

diff --git a/workflows/tiv.yml b/workflows/tiv.yml
@@ -64,7 +64,7 @@ spec:
         parameters:
           - name: echo
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{= workflow.parameters.version_argo_tasks }}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{= workflow.parameters.version_argo_tasks }}"
         command: [echo]
         args:
           - "{{inputs.parameters.echo}}"
diff --git a/workflows/util/create-thumbnails.yaml b/workflows/util/create-thumbnails.yaml
@@ -90,7 +90,7 @@ spec:
     - name: aws-list
       inputs:
       container:
-        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{workflow.parameters.version-argo-tasks}}
+        image: 019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{workflow.parameters.version-argo-tasks}}
         command: [node, /app/index.js]
         env:
           - name: AWS_ROLE_CONFIG_PATH
@@ -124,7 +124,7 @@ spec:
           - name: files
             path: /tmp/file_list.json
       container:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:topo-imagery-{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/topo-imagery:{{=sprig.trim(workflow.parameters['version-topo-imagery'])}}"
         resources:
           requests:
             memory: 7.8Gi
@@ -144,7 +144,7 @@ spec:
 
     - name: get-location
       script:
-        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/eks:argo-tasks-{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
+        image: "019359803926.dkr.ecr.ap-southeast-2.amazonaws.com/argo-tasks:{{=sprig.trim(workflow.parameters['version-argo-tasks'])}}"
         command: [node]
         source: |
           const fs = require('fs');