Skip to content

Commit

Permalink
Remove Service Principal identities (#294)
Browse files Browse the repository at this point in the history
* Use WMI for agro workflow pods

Co-authored-by: Tom Augspurger <[email protected]>
  • Loading branch information
mmcfarland and Tom Augspurger authored May 28, 2024
1 parent 9c242e6 commit 71bf445
Show file tree
Hide file tree
Showing 91 changed files with 318 additions and 1,661 deletions.
5 changes: 0 additions & 5 deletions datasets/aster/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ code:
src: ${{ local.path(./aster.py) }}
requirements: ${{ local.path(./requirements.txt) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: aster-l1t
template: ${{ local.path(./collection) }}
Expand Down
4 changes: 0 additions & 4 deletions datasets/aster/update-geometries-ingest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
options:
insert_group_size: 5000
insert_only: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
schema_version: 1.0.0
id: aster-update-geometries-ingest
Expand Down
16 changes: 0 additions & 16 deletions datasets/aster/update-geometries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ jobs:
args:
url: https://planetarycomputer.microsoft.com/api/stac/v1/collections/aster-l1t
asset_key: geoparquet-items
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
create-chunks:
foreach:
items: ${{ jobs.get-partitions.tasks.get-partitions.output.assets }}
Expand All @@ -34,10 +30,6 @@ jobs:
asset: ${{ item }}
dst_uri: blob://astersa/aster-etl-data/chunks/update-geometries-2023-01-23-00
chunk_size: 5000
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
tags:
batch_pool_id: high_memory_pool
update-items:
Expand All @@ -58,10 +50,6 @@ jobs:
chunk_id: ${{ item.id }}
item_chunkset_uri: blob://astersa/aster-etl-data/items/update-geometries-2023-01-23-00
simplify_tolerance: 0.001
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
- id: ingest-items
image_key: ingest
task: pctasks.ingest_task.task:ingest_task
Expand All @@ -73,7 +61,3 @@ jobs:
options:
insert_group_size: 5000
insert_only: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
5 changes: 0 additions & 5 deletions datasets/chesapeake_lulc/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ code:
src: ${{ local.path(./chesapeake_lulc.py) }}
requirements: ${{ local.path(./requirements.txt) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: chesapeake-lc-7
template: ${{ local.path(./collection/chesapeake-lc-7) }}
Expand Down
5 changes: 0 additions & 5 deletions datasets/cil-gdpcir/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ image: ${{ args.registry }}/pctasks-task-base:latest
args:
- registry

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: cil-gdpcir-cc-by
template: ${{ local.path(./collection/cil-gdpcir-cc-by) }}
Expand Down
4 changes: 0 additions & 4 deletions datasets/deltaresfloods/dataset.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
id: deltaresfloods
image: pccomponentstest.azurecr.io/pctasks-basic:2022.6.16.2
target_environment: staging
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: deltares-floods
Expand Down
5 changes: 0 additions & 5 deletions datasets/eclipse/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ image: ${{ args.registry }}/pctasks-task-base:latest
args:
- registry

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: eclipse
template: ${{ local.path(./collection) }}
Expand Down
3 changes: 0 additions & 3 deletions datasets/ecmwf-forecast/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ code:
src: ${{ local.path(./ecmwf_forecast.py) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}

collections:
Expand Down
3 changes: 0 additions & 3 deletions datasets/ecmwf-forecast/streaming.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ jobs:
collection_id: "ecmwf-forecast"

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}
PCTASKS_COSMOSDB__URL: ${{ args.cosmosdb_url }}
schema_version: 1.0.0
Expand Down
5 changes: 0 additions & 5 deletions datasets/era5-pds/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ image: ${{ args.registry }}/pctasks-task-base:latest
args:
- registry

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: goes-cmi
template: ${{ local.path(./collection) }}
Expand Down
5 changes: 0 additions & 5 deletions datasets/esa-cci-lc/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ code:
# included in the container image
# requirements: ${{ local.path(./requirements.txt) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: esa-cci-lc-netcdf
template: ${{ local.path(./collection/esa-cci-lc-netcdf) }}
Expand Down
5 changes: 0 additions & 5 deletions datasets/esa-worldcover/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ args:
code:
src: ${{ local.path(./esa_worldcover.py) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: esa-worldcover
template: ${{ local.path(./collection) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ jobs:
chunk_file_name: uris-list
chunk_extension: .csv
options: {}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
create-chunks:
id: create-chunks
Expand All @@ -41,10 +37,6 @@ jobs:
src_uri: ${{ item.uri }}
dst_uri: blob://ai4edataeuwest/esa-worldcover-etl-data/pctasks/2020-all/assets
options: ${{ item.chunk_options }}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
foreach:
items: ${{ jobs.create-splits.tasks.create-splits.output.splits }}
Expand All @@ -66,10 +58,6 @@ jobs:
collection_id: esa-worldcover
options:
skip_validation: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
- id: ingest-items
image_key: ingest
Expand All @@ -82,10 +70,6 @@ jobs:
options:
insert_group_size: 5000
insert_only: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
foreach:
items: ${{ jobs.create-chunks.tasks.create-chunks.output.chunks }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ jobs:
chunk_file_name: uris-list
chunk_extension: .csv
options: {}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
create-chunks:
id: create-chunks
Expand All @@ -41,10 +37,6 @@ jobs:
src_uri: ${{ item.uri }}
dst_uri: blob://ai4edataeuwest/esa-worldcover-etl-data/pctasks/2021-all/assets
options: ${{ item.chunk_options }}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
foreach:
items: ${{ jobs.create-splits.tasks.create-splits.output.splits }}
Expand All @@ -66,10 +58,6 @@ jobs:
collection_id: esa-worldcover
options:
skip_validation: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
- id: ingest-items
image_key: ingest
Expand All @@ -82,10 +70,6 @@ jobs:
options:
insert_group_size: 5000
insert_only: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
foreach:
items: ${{ jobs.create-chunks.tasks.create-chunks.output.chunks }}
Expand Down
4 changes: 0 additions & 4 deletions datasets/fws-nwi/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ args:
code:
src: ${{ local.path(./fws_nwi.py) }}
# requirements: ${{ local.path(./requirements.txt) }}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

task_config:
fws-nwi:
Expand Down
3 changes: 0 additions & 3 deletions datasets/gbif/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ code:
requirements: ${{ local.path(./requirements.txt) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}

collections:
Expand Down
3 changes: 0 additions & 3 deletions datasets/goes/goes-cmi/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ code:
src: ${{ local.path(./goes_cmi) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}

collections:
Expand Down
3 changes: 0 additions & 3 deletions datasets/goes/goes-cmi/streaming.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ jobs:
collection_id: "goes-cmi"

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}
PCTASKS_COSMOSDB__URL: ${{ args.cosmosdb_url }}
schema_version: 1.0.0
Expand Down
3 changes: 0 additions & 3 deletions datasets/goes/goes-glm/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ code:
# requirements: ${{ local.path(./requirements.txt) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}

collections:
Expand Down
3 changes: 0 additions & 3 deletions datasets/goes/goes-glm/streaming.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ jobs:
collection_id: "goes-glm"

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
APPLICATIONINSIGHTS_CONNECTION_STRING: ${{ secrets.task-application-insights-connection-string }}
PCTASKS_COSMOSDB__URL: ${{ args.cosmosdb_url }}
schema_version: 1.0.0
Expand Down
5 changes: 0 additions & 5 deletions datasets/goes/goes-glm/tests/dataset-dev-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ code:
src: ${{ local.path(../goes_glm.py) }}
requirements: ${{ local.path(../requirements.txt) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: goes-glm
template: ${{ local.path(../collection) }}
Expand Down
16 changes: 0 additions & 16 deletions datasets/goes/goes-glm/workflows/goes-glm-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ jobs:
chunk_extension: .csv
since: ${{ args.since }}
options: {}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
create-chunks:
id: create-chunks
Expand All @@ -63,10 +59,6 @@ jobs:
src_uri: ${{ item.uri }}
dst_uri: blob://goeseuwest/noaa-goes-etl-data/pctasks/glm/${{ args.since }}/assets
options: ${{ item.chunk_options }}
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
foreach:
items: ${{ jobs.create-splits.tasks.create-splits.output.splits }}
Expand All @@ -89,10 +81,6 @@ jobs:
collection_id: goes-glm
options:
skip_validation: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
- id: ingest-items
image_key: ingest
Expand All @@ -105,10 +93,6 @@ jobs:
options:
insert_group_size: 5000
insert_only: false
environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}
schema_version: 1.0.0
foreach:
items: ${{ jobs.create-chunks.tasks.create-chunks.output.chunks }}
Expand Down
5 changes: 0 additions & 5 deletions datasets/io-biodiversity/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ args:
code:
src: ${{ local.path(./io_biodiversity.py) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: io-biodiversity
template: ${{ local.path(./collection) }}
Expand Down
5 changes: 0 additions & 5 deletions datasets/io-land-cover/dataset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ args:
code:
src: ${{ local.path(./io_lulc.py) }}

environment:
AZURE_TENANT_ID: ${{ secrets.task-tenant-id }}
AZURE_CLIENT_ID: ${{ secrets.task-client-id }}
AZURE_CLIENT_SECRET: ${{ secrets.task-client-secret }}

collections:
- id: io-lulc
template: ${{ local.path(./collection/io-lulc) }}
Expand Down
Loading

0 comments on commit 71bf445

Please sign in to comment.