From f4f4fcc3295ea93c3a9d3173b97e111306bd35f3 Mon Sep 17 00:00:00 2001 From: Gytis Ivaskevicius Date: Thu, 3 Oct 2024 13:31:50 +0300 Subject: [PATCH 1/2] ci: fix cardano-services credentials if expression --- .github/workflows/cardano-services.yaml | 2 +- nix/cardano-services/deployments/ci.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cardano-services.yaml b/.github/workflows/cardano-services.yaml index e3ca9071c78..8f0cc6d2e31 100644 --- a/.github/workflows/cardano-services.yaml +++ b/.github/workflows/cardano-services.yaml @@ -10,7 +10,7 @@ jobs: - uses: aws-actions/configure-aws-credentials@v4.0.2 with: aws-region: us-east-1 - role-to-assume: ${{ contains(github.ref, "release/") && 'arn:aws:iam::926093910549:role/eks-admin' + role-to-assume: ${{ contains(github.ref, 'release/') && 'arn:aws:iam::926093910549:role/eks-admin' || 'arn:aws:iam::926093910549:role/eks-devs' }} - name: 🚀 Deploy run: 'echo "yes" | nix run .#cardano-services.${{inputs.target}}.${{inputs.action}} diff --git a/nix/cardano-services/deployments/ci.nix b/nix/cardano-services/deployments/ci.nix index 9f206f0afb8..99d6127aa2f 100644 --- a/nix/cardano-services/deployments/ci.nix +++ b/nix/cardano-services/deployments/ci.nix @@ -19,7 +19,7 @@ extraSteps = lib.singleton { uses = "aws-actions/configure-aws-credentials@v4.0.2"; "with" = { - role-to-assume = "\${{ contains(github.ref, \"release/\") && 'arn:aws:iam::926093910549:role/eks-admin' || 'arn:aws:iam::926093910549:role/eks-devs' }}"; + role-to-assume = "\${{ contains(github.ref, 'release/') && 'arn:aws:iam::926093910549:role/eks-admin' || 'arn:aws:iam::926093910549:role/eks-devs' }}"; aws-region = "us-east-1"; }; }; From f2eddc2a5ae5ae647690d206ec23493954ddc539 Mon Sep 17 00:00:00 2001 From: Gytis Ivaskevicius Date: Thu, 3 Oct 2024 13:38:17 +0300 Subject: [PATCH 2/2] ci: fix kubeconfig path --- nix/cardano-services/deployments/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix index f42190a1310..1c3e5ba1ded 100644 --- a/nix/cardano-services/deployments/default.nix +++ b/nix/cardano-services/deployments/default.nix @@ -42,7 +42,7 @@ in name = "${final.namespace}-cardanojs"; chart = ./Chart.yaml; context = "eks-devs"; - kubeconfig = "$PRJ_ROOT/.kube/${final.region}"; + kubeconfig = ../../local/kubeconfig + "/${final.region}"; utils = { mkPodEnv = lib.mapAttrsToList (