From 4babe2459a5d026b3e67c291465d35f31e8952f4 Mon Sep 17 00:00:00 2001
From: Armaan Tobaccowalla <armaan@tobaccowalla.com>
Date: Fri, 5 Mar 2021 16:12:04 -0500
Subject: [PATCH] AWS Migration

---
 .github/cdk/package.json                           | 2 +-
 .github/cdk/yarn.lock                              | 8 ++++----
 .github/workflows/cdkactions_build-and-deploy.yaml | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/cdk/package.json b/.github/cdk/package.json
index 0b9d2b6ad..53f330cf2 100644
--- a/.github/cdk/package.json
+++ b/.github/cdk/package.json
@@ -13,7 +13,7 @@
     "upgrade-cdk": "yarn upgrade cdkactions@latest cdkactions-cli@latest"
   },
   "dependencies": {
-    "@pennlabs/kraken": "^0.4.12",
+    "@pennlabs/kraken": "^0.5.0",
     "cdkactions": "^0.2.1",
     "constructs": "^3.2.80"
   },
diff --git a/.github/cdk/yarn.lock b/.github/cdk/yarn.lock
index fcb0a5596..c45830252 100644
--- a/.github/cdk/yarn.lock
+++ b/.github/cdk/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@pennlabs/kraken@^0.4.12":
-  version "0.4.12"
-  resolved "https://registry.yarnpkg.com/@pennlabs/kraken/-/kraken-0.4.12.tgz#1e01fcbc07f74c55bf08694d9c224c92a9a29b77"
-  integrity sha512-Wul9blNqPSnZDTv3zw40tN1bPYXP7/6BgFgopBYbCGFNig9/T7fMBoo8ueRaxrDN5721kkMT7LFElXqFo4VR3g==
+"@pennlabs/kraken@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@pennlabs/kraken/-/kraken-0.5.0.tgz#b79d24f3d34a1ef4aff7edc0e90e5bd9388c1897"
+  integrity sha512-4QHJ7hPoxswsNpELdlDXX73GKecelCdPXKf7MEJYZ3Xe3UCZGEStVLYFoJUEev+KaxN0IxxTqYZ3kfPqabqEIQ==
   dependencies:
     cdkactions "^0.2.0"
     constructs "^3.2.80"
diff --git a/.github/workflows/cdkactions_build-and-deploy.yaml b/.github/workflows/cdkactions_build-and-deploy.yaml
index 0219d3095..6a5341367 100644
--- a/.github/workflows/cdkactions_build-and-deploy.yaml
+++ b/.github/workflows/cdkactions_build-and-deploy.yaml
@@ -204,15 +204,13 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     container:
-      image: pennlabs/helm-tools:c964e53d3e3e88d36677e84f5437da40a289c7a4
+      image: pennlabs/helm-tools:39b60af248944898fcbc58d1fe5b0f1995420aef
     if: github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
       - name: Deploy
         run: |-
-          curl -s -X GET -H "Content-Type: application/json" -H "Authorization: Bearer $DO_AUTH_TOKEN" "https://api.digitalocean.com/v2/kubernetes/clusters/${K8S_CLUSTER_ID}/kubeconfig" > /kubeconfig.conf
-
-          export KUBECONFIG=/kubeconfig.conf
+          aws eks --region us-east-1 update-kubeconfig --name production --role-arn arn:aws:iam::${AWS_ACCOUNT_ID}:role/kubectl
 
           # get repo name (by removing owner/organization)
           RELEASE_NAME=${REPOSITORY#*/}
@@ -240,6 +238,9 @@ jobs:
           exit 1
         env:
           IMAGE_TAG: ${{ github.sha }}
+          AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.GH_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.GH_AWS_SECRET_ACCESS_KEY }}
           DO_AUTH_TOKEN: ${{ secrets.DO_AUTH_TOKEN }}
           K8S_CLUSTER_ID: ${{ secrets.K8S_CLUSTER_ID }}
           REPOSITORY: ${{ github.repository }}