From 71eb28a432e3cd4e1cb2873a41e0d8ae20e7b6b7 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:19:38 +0530
Subject: [PATCH 01/42] Create eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 58 +++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/eksdeployment.yml

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
new file mode 100644
index 0000000..f6f78e3
--- /dev/null
+++ b/.github/workflows/eksdeployment.yml
@@ -0,0 +1,58 @@
+name: Deploy to ECR
+
+on:
+ 
+  push:
+    branches: [ main ]
+
+env:
+  ECR_REPOSITORY: flask-app
+  EKS_CLUSTER_NAME: Kubernetes-demo 
+  AWS_REGION: us-east-1
+
+jobs:
+  
+  build:
+    
+    name: Deployment
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Set short git commit SHA
+      id: commit
+      uses: prompt/actions-commit-hash@v2
+
+    - name: Check out code
+      uses: actions/checkout@v2
+    
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{env.AWS_REGION}}
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+
+    - name: Build, tag, and push image to Amazon ECR
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
+        IMAGE_TAG: ${{ steps.commit.outputs.short }}
+      run: |
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f docker/Dockerfile .
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+
+    - name: Update kube config
+      run: aws eks update-kubeconfig --name $EKS_CLUSTER_NAME --region $AWS_REGION
+
+    - name: Deploy to EKS
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
+        IMAGE_TAG: ${{ steps.commit.outputs.short }}
+      run: |
+        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifests/hello-app-deployment.yaml && \
+        kubectl apply -f manifests/hello-app-deployment.yaml
+        kubectl apply -f manifests/hello-app-service.yaml

From de509cfa1a365927b37ba48df5f20b775aeaac09 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:38:19 +0530
Subject: [PATCH 02/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index f6f78e3..ac3b897 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -6,9 +6,9 @@ on:
     branches: [ main ]
 
 env:
-  ECR_REPOSITORY: flask-app
-  EKS_CLUSTER_NAME: Kubernetes-demo 
-  AWS_REGION: us-east-1
+  ECR_REPOSITORY: jave-app-ecr
+  EKS_CLUSTER_NAME: module-eks 
+  AWS_REGION: us-west-2
 
 jobs:
   
@@ -42,7 +42,7 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
         IMAGE_TAG: ${{ steps.commit.outputs.short }}
       run: |
-        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f docker/Dockerfile .
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f Dockerfile .
         docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
 
     - name: Update kube config

From 37f6f34dfeb484d61aa4494726c56160d84635a5 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:42:15 +0530
Subject: [PATCH 03/42] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 788134f..b4f0da6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG DEPENDENCY=target/dependency
 COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY ${DEPENDENCY}/META-INF /app/META-INF
 COPY ${DEPENDENCY}/BOOT-INF/classes /app
-COPY ${DEPENDENCY}/org /app/org
+#COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080
 

From d08b0c6b035e3a3cfa14287eeddd3acf40721ed1 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:43:48 +0530
Subject: [PATCH 04/42] Update Dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b4f0da6..fe5c498 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,9 @@ VOLUME /target
 RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
-COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-COPY ${DEPENDENCY}/META-INF /app/META-INF
-COPY ${DEPENDENCY}/BOOT-INF/classes /app
+#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+#COPY ${DEPENDENCY}/META-INF /app/META-INF
+#COPY ${DEPENDENCY}/BOOT-INF/classes /app
 #COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080

From 16201a1657bf274c6f4b1e4459534050b12767cc Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:52:01 +0530
Subject: [PATCH 05/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index ac3b897..59a1558 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -53,6 +53,6 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
         IMAGE_TAG: ${{ steps.commit.outputs.short }}
       run: |
-        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" manifests/hello-app-deployment.yaml && \
-        kubectl apply -f manifests/hello-app-deployment.yaml
-        kubectl apply -f manifests/hello-app-service.yaml
+        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" k8s-resources/deployment.yaml && \
+        kubectl apply -f k8s-resources/deployment.yaml
+        kubectl apply -f k8s-resources/service.yaml

From 386b3e75017f6f4f5213a8fcab9ccdf8d747a16b Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:22:24 +0530
Subject: [PATCH 06/42] Create terraformECR.tf

---
 terraformECR.tf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 terraformECR.tf

diff --git a/terraformECR.tf b/terraformECR.tf
new file mode 100644
index 0000000..82ff141
--- /dev/null
+++ b/terraformECR.tf
@@ -0,0 +1,21 @@
+
+
+provider "aws" {
+    access_key = "AKIAZ56BVM2TBZEH6CFI"
+    secret_key = "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"
+    region = "us-west-2"
+}
+
+
+
+
+
+
+resource "aws_ecr_repository" "foo" {
+  name                 = "jave-app-ecr2"
+  image_tag_mutability = "MUTABLE"
+
+  image_scanning_configuration {
+    scan_on_push = true
+  }
+}

From 001d296fa2f73e8c8b7dc5c2938f2cdde137f738 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:25:19 +0530
Subject: [PATCH 07/42] Create terraformdeploy

---
 .github/workflows/terraformdeploy | 56 +++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .github/workflows/terraformdeploy

diff --git a/.github/workflows/terraformdeploy b/.github/workflows/terraformdeploy
new file mode 100644
index 0000000..5448997
--- /dev/null
+++ b/.github/workflows/terraformdeploy
@@ -0,0 +1,56 @@
+name: Terraform AWS Workflow
+
+on:
+  workflow_call:
+  workflow_dispatch:
+    # Inputs the workflow accepts.
+    inputs:
+      tfpath:
+        description: 'TF File Path'     
+        required: false
+        default: ./terraformECR.tf
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  tf_code_check:
+    name: Terraform Validation and Build
+    runs-on: ubuntu-latest
+
+    if:  ${{ inputs.tfpath }} 
+    steps:
+    - name: Checkout tf code in runner environment
+      uses: actions/checkout@v3.5.2
+
+    - name: Configure AWS Credentials Action For GitHub Actions
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-west-2
+
+    - name: Setup Terraform CLI
+      uses: hashicorp/setup-terraform@v2.0.2
+
+    - name: Terraform init and validate
+      run: |
+        echo `pwd`
+        echo "tfpath ${{ github.event.inputs.tfpath }}"
+        echo "** Running Terraform Init**"
+        terraform init
+        
+        echo "** Running Terraform Validate**"
+        terraform validate
+      working-directory: ${{ github.event.inputs.tfpath }}
+    - name: Terraform plan and apply
+      run: |
+        echo `pwd`
+        echo "tfpath ${{ github.event.inputs.tfpath }}"        
+        echo "** Running Terraform Plan**"
+        terraform plan
+        
+        echo "** Running Terraform Apply**"
+        terraform apply -auto-approve
+      working-directory: ${{ github.event.inputs.tfpath }}

From 3379a4edd5b740fbbbc91da8b40223a157f57c5c Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:26:43 +0530
Subject: [PATCH 08/42] Rename terraformdeploy to terraformdeploy.yml

---
 .github/workflows/{terraformdeploy => terraformdeploy.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{terraformdeploy => terraformdeploy.yml} (100%)

diff --git a/.github/workflows/terraformdeploy b/.github/workflows/terraformdeploy.yml
similarity index 100%
rename from .github/workflows/terraformdeploy
rename to .github/workflows/terraformdeploy.yml

From 4f43b1f95ef48734cad587c20c0747ce2e2d1ff5 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:31:40 +0530
Subject: [PATCH 09/42] Update terraformdeploy.yml

---
 .github/workflows/terraformdeploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/terraformdeploy.yml b/.github/workflows/terraformdeploy.yml
index 5448997..3fbdfb0 100644
--- a/.github/workflows/terraformdeploy.yml
+++ b/.github/workflows/terraformdeploy.yml
@@ -11,8 +11,7 @@ on:
         default: ./terraformECR.tf
   push:
     branches: [ main ]
-  pull_request:
-    branches: [ main ]
+ 
 
 jobs:
   tf_code_check:

From 3cd1b606262166c5280c082861e3c1f60889869e Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 20:26:23 +0530
Subject: [PATCH 10/42] Update terraformdeploy.yml

---
 .github/workflows/terraformdeploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/terraformdeploy.yml b/.github/workflows/terraformdeploy.yml
index 3fbdfb0..9e7b959 100644
--- a/.github/workflows/terraformdeploy.yml
+++ b/.github/workflows/terraformdeploy.yml
@@ -8,7 +8,7 @@ on:
       tfpath:
         description: 'TF File Path'     
         required: false
-        default: ./terraformECR.tf
+        default: Terraform/terraform_AWs
   push:
     branches: [ main ]
  

From 5976cb6304c167cc99274519dc2c8bfc40b05b6e Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 5 Mar 2024 20:38:51 +0530
Subject: [PATCH 11/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index 59a1558..338b303 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -6,8 +6,8 @@ on:
     branches: [ main ]
 
 env:
-  ECR_REPOSITORY: jave-app-ecr
-  EKS_CLUSTER_NAME: module-eks 
+  ECR_REPOSITORY: tessolve-ecr
+  EKS_CLUSTER_NAME: tessolve-eks 
   AWS_REGION: us-west-2
 
 jobs:

From 0647af7e103f664cbba2fd88d1608b35394577b3 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 16:32:37 +0530
Subject: [PATCH 12/42] Create pullrequest.yml

---
 .github/workflows/pullrequest.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/pullrequest.yml

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
new file mode 100644
index 0000000..0e3596b
--- /dev/null
+++ b/.github/workflows/pullrequest.yml
@@ -0,0 +1,19 @@
+name: Pull Request Action
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  create-pull-request:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: main@v1
+      - name: pull-request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: "develop"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          pr_label: "feature, automated pr"
+          pr_title: "[Example] Simple demo"

From 4aa4fb91aa95fb5add3ac3a166c0417ebc4c6643 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:34:14 +0530
Subject: [PATCH 13/42] Update pullrequest.yml

---
 .github/workflows/pullrequest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 0e3596b..6bc56db 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -14,6 +14,6 @@ jobs:
         uses: repo-sync/pull-request@v2
         with:
           destination_branch: "develop"
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.GGITHUB_TOKEN }}
           pr_label: "feature, automated pr"
           pr_title: "[Example] Simple demo"

From 987f4c2bb5c278a302ab6f6097ed0715820a266d Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:37:45 +0530
Subject: [PATCH 14/42] Update pullrequest.yml

---
 .github/workflows/pullrequest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 6bc56db..e284459 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Check out repository code
         uses: main@v1
       - name: pull-request
-        uses: repo-sync/pull-request@v2
+        uses: Govardhan235/pull-request@v2
         with:
           destination_branch: "develop"
           github_token: ${{ secrets.GGITHUB_TOKEN }}

From 8b876b84f6756ac39cedfa952776cd1786157e46 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:40:19 +0530
Subject: [PATCH 15/42] Update pullrequest.yml

---
 .github/workflows/pullrequest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index e284459..799c7aa 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Check out repository code
         uses: main@v1
       - name: pull-request
-        uses: Govardhan235/pull-request@v2
+        uses: ./.github/actions/my-action@v2
         with:
           destination_branch: "develop"
           github_token: ${{ secrets.GGITHUB_TOKEN }}

From 0a05ed14493bdfa798c368251e115d46f7b38fc2 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:42:33 +0530
Subject: [PATCH 16/42] Update pullrequest.yml

---
 .github/workflows/pullrequest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 799c7aa..21683a3 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Check out repository code
         uses: main@v1
       - name: pull-request
-        uses: ./.github/actions/my-action@v2
+        uses: actions/checkout@v3
         with:
           destination_branch: "develop"
           github_token: ${{ secrets.GGITHUB_TOKEN }}

From d4e74a5da9fe0c73091ae76d4506426eb7d3d39d Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:43:52 +0530
Subject: [PATCH 17/42] Update pullrequest.yml

---
 .github/workflows/pullrequest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 21683a3..638cbbe 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: main@v1
+        uses: actions/checkout@v3
       - name: pull-request
         uses: actions/checkout@v3
         with:

From 655462cd256f08125535cb7ed9e6607c0c0e310a Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:48:31 +0530
Subject: [PATCH 18/42] Update terraformECR.tf

---
 terraformECR.tf | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/terraformECR.tf b/terraformECR.tf
index 82ff141..5615d6f 100644
--- a/terraformECR.tf
+++ b/terraformECR.tf
@@ -1,10 +1,6 @@
 
 
-provider "aws" {
-    access_key = "AKIAZ56BVM2TBZEH6CFI"
-    secret_key = "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"
-    region = "us-west-2"
-}
+
 
 
 

From ab593b8ac1ea1152c78e44ddf6cfc7fdbad3b64c Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:41:33 +0530
Subject: [PATCH 19/42] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index fe5c498..ec25c6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ VOLUME /target
 RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
-#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-#COPY ${DEPENDENCY}/META-INF /app/META-INF
+COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+COPY ${DEPENDENCY}/META-INF /app/META-INF
 #COPY ${DEPENDENCY}/BOOT-INF/classes /app
 #COPY ${DEPENDENCY}/org /app/org
 

From a40bc0b5db19f3e45b560594af1c9129a35ea75a Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:43:25 +0530
Subject: [PATCH 20/42] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ec25c6c..72b7b60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
 COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-COPY ${DEPENDENCY}/META-INF /app/META-INF
+#COPY ${DEPENDENCY}/META-INF /app/META-INF
 #COPY ${DEPENDENCY}/BOOT-INF/classes /app
 #COPY ${DEPENDENCY}/org /app/org
 

From 9747b51213c37b385ce20fad55aad0204d82648c Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:53:50 +0530
Subject: [PATCH 21/42] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2df2d2f..2fcfaff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 .vscode
 
 # Java / Maven
-target/
+#target/
 
 # MacOS
 .DS_Store

From abd89bd3918f5ab242b9b994a5624c00faa4ab56 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:19:04 +0530
Subject: [PATCH 22/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index e576b8b..48036e3 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: java-ms
-        image: bastianklein/java-ms:1.2
+        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:latest
         imagePullPolicy: Always
         resources:
           requests:

From ee0168a2783d00633a2d362c25e05dcd14fa5c22 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:21:34 +0530
Subject: [PATCH 23/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index 338b303..cfde5ba 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -8,7 +8,7 @@ on:
 env:
   ECR_REPOSITORY: tessolve-ecr
   EKS_CLUSTER_NAME: tessolve-eks 
-  AWS_REGION: us-west-2
+  AWS_REGION: us-east-1
 
 jobs:
   

From 1eee60bf93525b18c1f19c784d3342bafa586432 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:25:18 +0530
Subject: [PATCH 24/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index cfde5ba..64180c8 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -53,6 +53,5 @@ jobs:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}        
         IMAGE_TAG: ${{ steps.commit.outputs.short }}
       run: |
-        sed -i.bak "s|DOCKER_IMAGE|$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG|g" k8s-resources/deployment.yaml && \
         kubectl apply -f k8s-resources/deployment.yaml
         kubectl apply -f k8s-resources/service.yaml

From c4aea5d65b1b63573355eab600816f70430a530c Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:36:14 +0530
Subject: [PATCH 25/42] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 72b7b60..fe5c498 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ VOLUME /target
 RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
-COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
 #COPY ${DEPENDENCY}/META-INF /app/META-INF
 #COPY ${DEPENDENCY}/BOOT-INF/classes /app
 #COPY ${DEPENDENCY}/org /app/org

From a3cef1dafa135a01f3d4bda7dd366f5bfbe4af00 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:43:10 +0530
Subject: [PATCH 26/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index 48036e3..68c4fc9 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -24,8 +24,8 @@ spec:
             cpu: "500m" #half the CPU free: 0.5 Core
             memory: "256Mi"
           limits:
-            cpu: "1000m" #max 1.0 Core
-            memory: "512Mi"
+            cpu: "700m" #max 1.0 Core
+            memory: "412Mi"
         env:
           - name: SPRING_REDIS_HOST
             valueFrom:

From c2c110eb0ea6230e38b6dbc1e5f212315e1ee427 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:03:55 +0530
Subject: [PATCH 27/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index 68c4fc9..0a34086 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: java-ms
-        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:latest
+        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:a3cef1d
         imagePullPolicy: Always
         resources:
           requests:

From 6fc2afdddecf14da003035ae85432976b99416bd Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:51:48 +0530
Subject: [PATCH 28/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index 0a34086..d53f28b 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: java-ms
 spec:
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: java-ms

From 308d59eabc2cfaf113a6099d2c677da9c5a12dbb Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:22:20 +0530
Subject: [PATCH 29/42] Update config-map.yaml

---
 k8s-resources/config-map.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/k8s-resources/config-map.yaml b/k8s-resources/config-map.yaml
index 324e84c..7397ae1 100644
--- a/k8s-resources/config-map.yaml
+++ b/k8s-resources/config-map.yaml
@@ -4,5 +4,7 @@ metadata:
   name: java-ms
   namespace: default
 data:
-  host: "***.***.9vakxk.0001.euc1.cache.amazonaws.com"
+  
+  #host: "***.***.9vakxk.0001.euc1.cache.amazonaws.com"
+  host: "redisaws.19uty9.clustercfg.use1.cache.amazonaws.com"
   port: "6379"

From b892dd58e5053ac14ec5654643b71f60c62816eb Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:26:47 +0530
Subject: [PATCH 30/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index 64180c8..9354cc1 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -55,3 +55,4 @@ jobs:
       run: |
         kubectl apply -f k8s-resources/deployment.yaml
         kubectl apply -f k8s-resources/service.yaml
+        kubectl apply -f k8s-resources/config-map.yaml

From 4d5c3feaffc35a1771a4cc9fdd711f21ac46c01f Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:34:52 +0530
Subject: [PATCH 31/42] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index fe5c498..7822962 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ VOLUME /target
 RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
+COPY . /app
 #COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
 #COPY ${DEPENDENCY}/META-INF /app/META-INF
 #COPY ${DEPENDENCY}/BOOT-INF/classes /app

From 872f58339665474e3b0bd4027f3ddec7a9117480 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:37:15 +0530
Subject: [PATCH 32/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index d53f28b..bfbbc42 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: java-ms
-        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:a3cef1d
+        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:4d5c3fe
         imagePullPolicy: Always
         resources:
           requests:

From f01f6f30d299e47a6604decbd7ce22de9f2050be Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:40:23 +0530
Subject: [PATCH 33/42] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 7822962..a8b90ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,10 +8,10 @@ RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
 COPY . /app
-#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-#COPY ${DEPENDENCY}/META-INF /app/META-INF
-#COPY ${DEPENDENCY}/BOOT-INF/classes /app
-#COPY ${DEPENDENCY}/org /app/org
+COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+COPY ${DEPENDENCY}/META-INF /app/META-INF
+COPY ${DEPENDENCY}/BOOT-INF/classes /app
+COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080
 

From 558554b3af30f01b1657181e0bd9260de2ab6809 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:44:01 +0530
Subject: [PATCH 34/42] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a8b90ef..cea8e64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY . /app
 COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY ${DEPENDENCY}/META-INF /app/META-INF
 COPY ${DEPENDENCY}/BOOT-INF/classes /app
-COPY ${DEPENDENCY}/org /app/org
+#COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080
 

From 0f25664ae2420cfa823601cb52349502288b3f14 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:47:54 +0530
Subject: [PATCH 35/42] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index cea8e64..1759cb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,11 +8,12 @@ RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
 COPY . /app
-COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-COPY ${DEPENDENCY}/META-INF /app/META-INF
-COPY ${DEPENDENCY}/BOOT-INF/classes /app
+#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+#COPY ${DEPENDENCY}/META-INF /app/META-INF
+#COPY ${DEPENDENCY}/BOOT-INF/classes /app
 #COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*", "com/amazon/aws/SpringBootSessionApplication"]
+#ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*", "com/amazon/aws/SpringBootSessionApplication"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*"]

From 172ca11c6d7cd1c1ab122f87058174d81686f443 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:49:45 +0530
Subject: [PATCH 36/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index bfbbc42..ca402e0 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: java-ms
-        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:4d5c3fe
+        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:0f25664
         imagePullPolicy: Always
         resources:
           requests:

From aa3141f8a76b96eaa06345d7519626669a4d7423 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:56:55 +0530
Subject: [PATCH 37/42] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2fcfaff..2df2d2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 .vscode
 
 # Java / Maven
-#target/
+target/
 
 # MacOS
 .DS_Store

From ed954ef9722f2b8cabb59c983d9c2fd346f8cde6 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:00:10 +0530
Subject: [PATCH 38/42] Update eksdeployment.yml

---
 .github/workflows/eksdeployment.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/eksdeployment.yml b/.github/workflows/eksdeployment.yml
index 9354cc1..7f23c5a 100644
--- a/.github/workflows/eksdeployment.yml
+++ b/.github/workflows/eksdeployment.yml
@@ -25,6 +25,13 @@ jobs:
 
     - name: Check out code
       uses: actions/checkout@v2
+    - name: Set up JDK 14
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+
+    - name: Build project with Maven
+      run: mvn -B package --file pom.xml  
     
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v1

From 5a6add7273700ceb964bbea1b5d1ed781a272a28 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:02:26 +0530
Subject: [PATCH 39/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index ca402e0..292a67e 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: java-ms
-        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:0f25664
+        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:ed954ef
         imagePullPolicy: Always
         resources:
           requests:

From d0319cf615f269571c37e7d70691dd6e888b56ce Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:05:01 +0530
Subject: [PATCH 40/42] Update Dockerfile

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1759cb9..3a811c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,12 +8,12 @@ RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
 COPY . /app
-#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-#COPY ${DEPENDENCY}/META-INF /app/META-INF
-#COPY ${DEPENDENCY}/BOOT-INF/classes /app
-#COPY ${DEPENDENCY}/org /app/org
+COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+COPY ${DEPENDENCY}/META-INF /app/META-INF
+COPY ${DEPENDENCY}/BOOT-INF/classes /app
+COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080
 
-#ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*", "com/amazon/aws/SpringBootSessionApplication"]
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*", "com/amazon/aws/SpringBootSessionApplication"]
+##ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-cp","app:app/lib/*"]

From 569b40c16fe792d7bf954c030f677afaee48d139 Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:07:25 +0530
Subject: [PATCH 41/42] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 3a811c9..5ffcf23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,10 +8,10 @@ RUN addgroup -S demo-app && adduser -S demo-app -G demo-app
 USER demo-app:demo-app
 ARG DEPENDENCY=target/dependency
 COPY . /app
-COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
-COPY ${DEPENDENCY}/META-INF /app/META-INF
-COPY ${DEPENDENCY}/BOOT-INF/classes /app
-COPY ${DEPENDENCY}/org /app/org
+#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+#COPY ${DEPENDENCY}/META-INF /app/META-INF
+#COPY ${DEPENDENCY}/BOOT-INF/classes /app
+#COPY ${DEPENDENCY}/org /app/org
 
 EXPOSE 8080
 

From 8ed5e634d5171e8b2fa4792b1b09dc2ffabb749c Mon Sep 17 00:00:00 2001
From: Govardhan0235 <81092877+Govardhan0235@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:10:33 +0530
Subject: [PATCH 42/42] Update deployment.yaml

---
 k8s-resources/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s-resources/deployment.yaml b/k8s-resources/deployment.yaml
index 292a67e..63cf912 100644
--- a/k8s-resources/deployment.yaml
+++ b/k8s-resources/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: java-ms
-        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:ed954ef
+        image: 975050223236.dkr.ecr.us-east-1.amazonaws.com/tessolve-ecr:569b40c
         imagePullPolicy: Always
         resources:
           requests: