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 +} 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 +} diff --git a/Jenkins-Server-TF/backend.tf b/Jenkins-Server-TF/backend.tf index 9d46f4e7c..a66118817 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 = "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" @@ -13,4 +13,4 @@ terraform { source = "hashicorp/aws" } } -} \ No newline at end of file +} 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" 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