From da3ae9446a0963072ea647f108dfd15c6f9aa743 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli <139383246+hari-akkinapalli@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:20:10 +0530 Subject: [PATCH 01/16] Update backend.tf --- Jenkins-Server-TF/backend.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkins-Server-TF/backend.tf b/Jenkins-Server-TF/backend.tf index 9d46f4e7c..dc9f98518 100644 --- a/Jenkins-Server-TF/backend.tf +++ b/Jenkins-Server-TF/backend.tf @@ -1,6 +1,6 @@ terraform { backend "s3" { - bucket = "my-ews-baket1" + bucket = "devsecops-project-bucket1" region = "us-east-1" key = "End-to-End-Kubernetes-Three-Tier-DevSecOps-Project/Jenkins-Server-TF/terraform.tfstate" dynamodb_table = "Lock-Files" @@ -13,4 +13,4 @@ terraform { source = "hashicorp/aws" } } -} \ No newline at end of file +} From 41b6fe15453b8b56446549d8b95a5e93c4d26b29 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli <139383246+hari-akkinapalli@users.noreply.github.com> Date: Tue, 24 Jun 2025 14:23:20 +0530 Subject: [PATCH 02/16] Update variables.tfvars --- Jenkins-Server-TF/variables.tfvars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkins-Server-TF/variables.tfvars b/Jenkins-Server-TF/variables.tfvars index 310601aa9..d19881776 100644 --- a/Jenkins-Server-TF/variables.tfvars +++ b/Jenkins-Server-TF/variables.tfvars @@ -4,5 +4,5 @@ subnet-name = "Jenkins-subnet" rt-name = "Jenkins-route-table" sg-name = "Jenkins-sg" instance-name = "Jenkins-server" -key-name = "Aman-Pathak" -iam-role = "Jenkins-iam-role" \ No newline at end of file +key-name = "IronMan" +iam-role = "Jenkins-iam-role" From c7c860f8bb4e9de716b7f9f36aedd6ad8d712093 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 17:36:52 +0000 Subject: [PATCH 03/16] Update deployment Image to version 7 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 5ced3cb5e..62752f4d4 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:1 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:7 imagePullPolicy: Always env: - name: MONGO_CONN_STR From c943256a03c952c8e23486fde06eb5c0b348a3dd Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 17:46:41 +0000 Subject: [PATCH 04/16] Update deployment Image to version 8 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 62752f4d4..1d971c3c6 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:7 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:8 imagePullPolicy: Always env: - name: MONGO_CONN_STR From 15fb903d9c319388f67b8925fc960f8398839fbb Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 18:54:18 +0000 Subject: [PATCH 05/16] Update deployment to version 16 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 1d971c3c6..6db339e78 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:8 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:16 imagePullPolicy: Always env: - name: MONGO_CONN_STR From 2327a14a05afc998a5e23b88dd5b2fb0819a98ec Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 19:05:37 +0000 Subject: [PATCH 06/16] Update deployment to version 18 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 6db339e78..e5de2d7ae 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:16 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:18 imagePullPolicy: Always env: - name: MONGO_CONN_STR From 42201be4f288ee7b34ec611186a2c905ee86b806 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 19:20:28 +0000 Subject: [PATCH 07/16] Update deployment to version 19 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index e5de2d7ae..ea0657211 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:18 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:19 imagePullPolicy: Always env: - name: MONGO_CONN_STR From e8726a06cd84e7366fd09475cb59c4a5131ff614 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 19:39:22 +0000 Subject: [PATCH 08/16] Update deployment to version 21 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index ea0657211..82396daad 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:19 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:21 imagePullPolicy: Always env: - name: MONGO_CONN_STR From 48ac9a5f5b515103d9172aec9b9f61b2be4d56bc Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 20:11:21 +0000 Subject: [PATCH 09/16] Update deployment to version 27 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 82396daad..717a6b84a 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:21 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:27 imagePullPolicy: Always env: - name: MONGO_CONN_STR From 7f8e77638551229eb83ef8cd9914ccb6476154ce Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Tue, 24 Jun 2025 20:20:04 +0000 Subject: [PATCH 10/16] Update deployment to version 30 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 717a6b84a..fbc63d7bc 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:27 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:30 imagePullPolicy: Always env: - name: MONGO_CONN_STR From 969f0706d34ee5f2873bfc84c064259470a5665c Mon Sep 17 00:00:00 2001 From: hari-akkinapalli <139383246+hari-akkinapalli@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:37:31 +0530 Subject: [PATCH 11/16] Update backend.tf --- Jenkins-Server-TF/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins-Server-TF/backend.tf b/Jenkins-Server-TF/backend.tf index dc9f98518..a66118817 100644 --- a/Jenkins-Server-TF/backend.tf +++ b/Jenkins-Server-TF/backend.tf @@ -1,6 +1,6 @@ terraform { backend "s3" { - bucket = "devsecops-project-bucket1" + bucket = "three-tier-devsecops" region = "us-east-1" key = "End-to-End-Kubernetes-Three-Tier-DevSecOps-Project/Jenkins-Server-TF/terraform.tfstate" dynamodb_table = "Lock-Files" From bd708adeb25604bf1aae2b81f8cdb03c2f840256 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli <139383246+hari-akkinapalli@users.noreply.github.com> Date: Fri, 27 Jun 2025 16:36:27 +0530 Subject: [PATCH 12/16] Update Jenkinsfile-Backend --- Jenkins-Pipeline-Code/Jenkinsfile-Backend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkins-Pipeline-Code/Jenkinsfile-Backend b/Jenkins-Pipeline-Code/Jenkinsfile-Backend index b0826fb70..b76be480e 100644 --- a/Jenkins-Pipeline-Code/Jenkinsfile-Backend +++ b/Jenkins-Pipeline-Code/Jenkinsfile-Backend @@ -19,7 +19,7 @@ pipeline { } stage('Checkout from Git') { steps { - git credentialsId: 'GITHUB', url: 'https://github.com/AmanPathak-DevOps/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' + git credentialsId: 'GITHUB', url: 'https://github.com/hari-akkinapalli/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' } } stage('Sonarqube Analysis') { @@ -82,20 +82,20 @@ pipeline { } stage('Checkout Code') { steps { - git credentialsId: 'GITHUB', url: 'https://github.com/AmanPathak-DevOps/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' + git credentialsId: 'GITHUB', url: 'https://github.com/hari-akkinapalli/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' } } stage('Update Deployment file') { environment { GIT_REPO_NAME = "End-to-End-Kubernetes-Three-Tier-DevSecOps-Project" - GIT_USER_NAME = "AmanPathak-DevOps" + GIT_USER_NAME = "hari-akkinapalli" } steps { dir('Kubernetes-Manifests-file/Backend') { withCredentials([string(credentialsId: 'github', variable: 'GITHUB_TOKEN')]) { sh ''' - git config user.email "aman07pathak@gmail.com" - git config user.name "AmanPathak-DevOps" + git config user.email "anvharikrishna@gmail.com" + git config user.name "hari-akkinapalli" BUILD_NUMBER=${BUILD_NUMBER} echo $BUILD_NUMBER imageTag=$(grep -oP '(?<=backend:)[^ ]+' deployment.yaml) @@ -110,4 +110,4 @@ pipeline { } } } -} \ No newline at end of file +} From cb9676a74dfda102d817e0532517ad52a932ad80 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli <139383246+hari-akkinapalli@users.noreply.github.com> Date: Fri, 27 Jun 2025 16:37:36 +0530 Subject: [PATCH 13/16] Update backend.tf From afd74975b0e44085b2061b3c9d12cb4467de1900 Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Fri, 27 Jun 2025 11:36:53 +0000 Subject: [PATCH 14/16] Update deployment Image to version 1 --- Kubernetes-Manifests-file/Backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index fbc63d7bc..5ced3cb5e 100644 --- a/Kubernetes-Manifests-file/Backend/deployment.yaml +++ b/Kubernetes-Manifests-file/Backend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: api - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:30 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:1 imagePullPolicy: Always env: - name: MONGO_CONN_STR From cdf82051bd287f32b91360ed2339a6767cb6e99b Mon Sep 17 00:00:00 2001 From: hari-akkinapalli <139383246+hari-akkinapalli@users.noreply.github.com> Date: Fri, 27 Jun 2025 17:19:59 +0530 Subject: [PATCH 15/16] Update Jenkinsfile-Frontend --- Jenkins-Pipeline-Code/Jenkinsfile-Frontend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkins-Pipeline-Code/Jenkinsfile-Frontend b/Jenkins-Pipeline-Code/Jenkinsfile-Frontend index 9be1a50c0..54748fa80 100644 --- a/Jenkins-Pipeline-Code/Jenkinsfile-Frontend +++ b/Jenkins-Pipeline-Code/Jenkinsfile-Frontend @@ -19,7 +19,7 @@ pipeline { } stage('Checkout from Git') { steps { - git credentialsId: 'GITHUB', url: 'https://github.com/AmanPathak-DevOps/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' + git credentialsId: 'GITHUB', url: 'https://github.com/hari-akkinapalli/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' } } stage('Sonarqube Analysis') { @@ -82,20 +82,20 @@ pipeline { } stage('Checkout Code') { steps { - git credentialsId: 'GITHUB', url: 'https://github.com/AmanPathak-DevOps/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' + git credentialsId: 'GITHUB', url: 'https://github.com/hari-akkinapalli/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' } } stage('Update Deployment file') { environment { GIT_REPO_NAME = "End-to-End-Kubernetes-Three-Tier-DevSecOps-Project" - GIT_USER_NAME = "AmanPathak-DevOps" + GIT_USER_NAME = "hari-akkinapalli" } steps { dir('Kubernetes-Manifests-file/Frontend') { withCredentials([string(credentialsId: 'github', variable: 'GITHUB_TOKEN')]) { sh ''' - git config user.email "aman07pathak@gmail.com" - git config user.name "AmanPathak-DevOps" + git config user.email "anvharikrishna@gmail.com" + git config user.name "hari-akkinapalli" BUILD_NUMBER=${BUILD_NUMBER} echo $BUILD_NUMBER imageTag=$(grep -oP '(?<=frontend:)[^ ]+' deployment.yaml) @@ -110,4 +110,4 @@ pipeline { } } } -} \ No newline at end of file +} From 064992aa59ab636f050198215205edcd5e77ab5a Mon Sep 17 00:00:00 2001 From: hari-akkinapalli Date: Fri, 27 Jun 2025 13:32:39 +0000 Subject: [PATCH 16/16] Update deployment Image to version 11 --- Kubernetes-Manifests-file/Frontend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kubernetes-Manifests-file/Frontend/deployment.yaml b/Kubernetes-Manifests-file/Frontend/deployment.yaml index 24f73e8c8..c4ee13d22 100644 --- a/Kubernetes-Manifests-file/Frontend/deployment.yaml +++ b/Kubernetes-Manifests-file/Frontend/deployment.yaml @@ -25,7 +25,7 @@ spec: - name: ecr-registry-secret containers: - name: frontend - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/frontend:3 + image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/frontend:11 imagePullPolicy: Always env: - name: REACT_APP_BACKEND_URL