From 965a1ae3de96a99d5ade8b688af888f0bbcc5b74 Mon Sep 17 00:00:00 2001
From: Anand Devarajan <devanand73@yahoo.co.uk>
Date: Fri, 14 May 2021 00:57:49 +0530
Subject: [PATCH 1/4] build error due to auth issue fixed

---
 eks_cicd/aws-auth.yaml | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/eks_cicd/aws-auth.yaml b/eks_cicd/aws-auth.yaml
index 00ce694..8504b83 100644
--- a/eks_cicd/aws-auth.yaml
+++ b/eks_cicd/aws-auth.yaml
@@ -4,35 +4,14 @@ data:
     - groups:
       - system:bootstrappers
       - system:nodes
-      rolearn: arn:aws:iam::120717539064:role/eksctl-cicd-demo-nodegroup-ng-1-NodeInstanceRole-AHYQIRO1R4HE
+      rolearn: arn:aws:iam::945491817958:role/eksctl-cicd-demo-nodegroup-ng-1-NodeInstanceRole-1QQDA7NWB0XFI
       username: system:node:{{EC2PrivateDNSName}}
-    - groups:
-      - system:masters
-      rolearn: arn:aws:iam::120717539064:role/service-role/codebuild-cicddemobuildproject-service-role
-      username: codebuild-cicddemobuildproject-service-role
-    - groups:
-      - system:masters
-      rolearn: arn:aws:iam::120717539064:role/CodeBuildKubectlRole
-      username: CodeBuildKubectlRole
   mapUsers: |
     []
 kind: ConfigMap
 metadata:
-  annotations:
-    kubectl.kubernetes.io/last-applied-configuration: |
-      {"apiVersion":"v1","data":{"mapRoles":"- rolearn: arn:aws:iam::120717539064:role/service-role/codebuild-cicddemobuildproject-service-role\n  username: codebuild-cicddemobuildproject-service-role\n  groups:\n    - system:masters\n    \n- rolearn: arn:aws:iam::120717539064:role/eksctl-cicd-demo-nodegroup-ng-1-NodeInstanceRole-AHYQIRO1R4HE\n  username: system:node:{{EC2PrivateDNSName}}\n  groups:\n    - system:bootstrappers\n    - system:nodes\n"},"kind":"ConfigMap","metadata":{"annotations":{},"name":"aws-auth","namespace":"kube-system"}}
-  creationTimestamp: "2021-04-27T20:43:23Z"
+  creationTimestamp: "2021-05-13T14:16:09Z"
   managedFields:
-  - apiVersion: v1
-    fieldsType: FieldsV1
-    fieldsV1:
-      f:metadata:
-        f:annotations:
-          .: {}
-          f:kubectl.kubernetes.io/last-applied-configuration: {}
-    manager: kubectl
-    operation: Update
-    time: "2021-04-27T21:20:12Z"
   - apiVersion: v1
     fieldsType: FieldsV1
     fieldsV1:
@@ -42,9 +21,9 @@ metadata:
         f:mapUsers: {}
     manager: eksctl
     operation: Update
-    time: "2021-04-28T04:15:13Z"
+    time: "2021-05-13T14:16:09Z"
   name: aws-auth
   namespace: kube-system
-  resourceVersion: "98026"
+  resourceVersion: "1763"
   selfLink: /api/v1/namespaces/kube-system/configmaps/aws-auth
-  uid: 414c6bae-79e4-4f24-a1d5-d30e615c904c
+  uid: f3a3f5c6-1963-4a8e-865f-0adad60992b0

From 39c87270e701a2573b5b2afe0f88146fdb1806bd Mon Sep 17 00:00:00 2001
From: devanand73 <devanand73@yahoo.co.uk>
Date: Fri, 14 May 2021 16:27:32 +0530
Subject: [PATCH 2/4] updated AWS account info

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9b373f..c71756c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM 120717539064.dkr.ecr.us-west-2.amazonaws.com/node:14
+FROM 945491817958.dkr.ecr.us-west-2.amazonaws.com/node:14
 
 # Setting working directory. All the path will be relative to WORKDIR
 WORKDIR /usr/src/app
@@ -16,4 +16,4 @@ RUN npm install
 COPY . .
 
 EXPOSE 3000
-CMD [ "node", "index.js" ]
\ No newline at end of file
+CMD [ "node", "index.js" ]

From 58ce113b5c507384142ff77dee07ccd65a3bdb88 Mon Sep 17 00:00:00 2001
From: devanand73 <devanand73@yahoo.co.uk>
Date: Fri, 14 May 2021 16:46:44 +0530
Subject: [PATCH 3/4] again updated

removed account part and just keept FRM node:14
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c71756c..b2417de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM 945491817958.dkr.ecr.us-west-2.amazonaws.com/node:14
+FROM node:14
 
 # Setting working directory. All the path will be relative to WORKDIR
 WORKDIR /usr/src/app

From c5269cf85b302848dd59fa77f96d2ddf12f699d3 Mon Sep 17 00:00:00 2001
From: devanand73 <devanand73@yahoo.co.uk>
Date: Fri, 14 May 2021 18:37:36 +0530
Subject: [PATCH 4/4] update source image

update line:1 FROM instruction to 945491817958.dkr.ecr.us-west-2.amazonaws.com/cicd-demo:14
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b2417de..d4faff3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14
+FROM 945491817958.dkr.ecr.us-west-2.amazonaws.com/cicd-demo:14
 
 # Setting working directory. All the path will be relative to WORKDIR
 WORKDIR /usr/src/app