From 4b86abca7710fa42d8091c8be3fb35c399b08a24 Mon Sep 17 00:00:00 2001 From: Nafisa Tabassum Date: Tue, 15 Oct 2024 11:09:42 -0600 Subject: [PATCH 1/2] treat aws ops as argo wfs ops --- actions/trigger-argo-workflow/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/trigger-argo-workflow/action.yaml b/actions/trigger-argo-workflow/action.yaml index 222384259..01fb571c3 100644 --- a/actions/trigger-argo-workflow/action.yaml +++ b/actions/trigger-argo-workflow/action.yaml @@ -75,7 +75,7 @@ runs: vault_instance="dev" ;; ops) - cluster="ops-us-east-0" + cluster="ops-eu-south-0" vault_instance="ops" ;; ops-aws) From d4f2fb763b4e490abe32017284815313061b28d3 Mon Sep 17 00:00:00 2001 From: Nafisa Tabassum Date: Mon, 28 Oct 2024 13:50:43 -0600 Subject: [PATCH 2/2] replace with aws ops instance --- actions/trigger-argo-workflow/action.yaml | 6 +----- .../trigger-argo-workflow/cmd/trigger-argo-workflow/argo.go | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/actions/trigger-argo-workflow/action.yaml b/actions/trigger-argo-workflow/action.yaml index 01fb571c3..fc4929b41 100644 --- a/actions/trigger-argo-workflow/action.yaml +++ b/actions/trigger-argo-workflow/action.yaml @@ -4,7 +4,7 @@ description: Trigger an Argo workflow in the Grafana Labs Argo Workflows instanc inputs: instance: description: | - The instance to use (`dev`, `ops` or `ops-aws`). Defaults to `ops`. + The instance to use (`dev` or `ops`). Defaults to `ops`. default: ops namespace: description: | @@ -78,10 +78,6 @@ runs: cluster="ops-eu-south-0" vault_instance="ops" ;; - ops-aws) - cluster="ops-eu-south-0" - vault_instance="ops" - ;; *) echo "unknown instance '${{ inputs.instance }}'" exit 1 diff --git a/actions/trigger-argo-workflow/cmd/trigger-argo-workflow/argo.go b/actions/trigger-argo-workflow/cmd/trigger-argo-workflow/argo.go index 776165dd0..3ad89ea75 100644 --- a/actions/trigger-argo-workflow/cmd/trigger-argo-workflow/argo.go +++ b/actions/trigger-argo-workflow/cmd/trigger-argo-workflow/argo.go @@ -35,7 +35,6 @@ type App struct { var instanceToHost = map[string]string{ "dev": "argo-workflows-dev.grafana.net:443", "ops": "argo-workflows.grafana.net:443", - "ops-aws": "argo-workflows-aws.grafana.net:443", } func (a App) server() string {