Skip to content
14 changes: 7 additions & 7 deletions Jenkins-Pipeline-Code/Jenkinsfile-Backend
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
SCANNER_HOME=tool 'sonar-scanner'
AWS_ACCOUNT_ID = credentials('ACCOUNT_ID')
AWS_ECR_REPO_NAME = credentials('ECR_REPO2')
AWS_DEFAULT_REGION = 'us-east-1'
AWS_DEFAULT_REGION = 'ap-south-1'
REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/"
}
stages {
Expand All @@ -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/mdsajid786/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git'
}
}
stage('Sonarqube Analysis') {
Expand Down Expand Up @@ -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/mdsajid786/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 = "mdsajid786"
}
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 "mdsajid020@gmail.com"
git config user.name "mdsajid786"
BUILD_NUMBER=${BUILD_NUMBER}
echo $BUILD_NUMBER
imageTag=$(grep -oP '(?<=backend:)[^ ]+' deployment.yaml)
Expand All @@ -110,4 +110,4 @@ pipeline {
}
}
}
}
}
14 changes: 7 additions & 7 deletions Jenkins-Pipeline-Code/Jenkinsfile-Frontend
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
SCANNER_HOME=tool 'sonar-scanner'
AWS_ACCOUNT_ID = credentials('ACCOUNT_ID')
AWS_ECR_REPO_NAME = credentials('ECR_REPO1')
AWS_DEFAULT_REGION = 'us-east-1'
AWS_DEFAULT_REGION = 'ap-south-1'
REPOSITORY_URI = "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/"
}
stages {
Expand All @@ -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/mdsajid786/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git'
}
}
stage('Sonarqube Analysis') {
Expand Down Expand Up @@ -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/mdsajid786/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 = "mdsajid786"
}
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 "mdsajid020@gmail.com"
git config user.name "mdsajid786"
BUILD_NUMBER=${BUILD_NUMBER}
echo $BUILD_NUMBER
imageTag=$(grep -oP '(?<=frontend:)[^ ]+' deployment.yaml)
Expand All @@ -110,4 +110,4 @@ pipeline {
}
}
}
}
}
6 changes: 3 additions & 3 deletions Jenkins-Server-TF/backend.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
backend "s3" {
bucket = "my-ews-baket1"
region = "us-east-1"
bucket = "mdsajid-cicd-devops"
region = "ap-south-1"
key = "End-to-End-Kubernetes-Three-Tier-DevSecOps-Project/Jenkins-Server-TF/terraform.tfstate"
dynamodb_table = "Lock-Files"
encrypt = true
Expand All @@ -13,4 +13,4 @@ terraform {
source = "hashicorp/aws"
}
}
}
}
4 changes: 2 additions & 2 deletions Jenkins-Server-TF/provider.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
provider "aws" {
region = "us-east-1"
}
region = "ap-south-1"
}
4 changes: 2 additions & 2 deletions Jenkins-Server-TF/variables.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -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"
key-name = "sajidcicd"
iam-role = "Jenkins-iam-role"
4 changes: 2 additions & 2 deletions Jenkins-Server-TF/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ resource "aws_internet_gateway" "igw" {
resource "aws_subnet" "public-subnet" {
vpc_id = aws_vpc.vpc.id
cidr_block = "10.0.1.0/24"
availability_zone = "us-east-1a"
availability_zone = "ap-south-1a"
map_public_ip_on_launch = true

tags = {
Expand Down Expand Up @@ -70,4 +70,4 @@ resource "aws_security_group" "security-group" {
tags = {
Name = var.sg-name
}
}
}
2 changes: 1 addition & 1 deletion Kubernetes-Manifests-file/Backend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- name: ecr-registry-secret
containers:
- name: api
image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/backend:1
image: 975050171672.dkr.ecr.ap-south-1.amazonaws.com/backend:2
imagePullPolicy: Always
env:
- name: MONGO_CONN_STR
Expand Down
2 changes: 1 addition & 1 deletion Kubernetes-Manifests-file/Frontend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- name: ecr-registry-secret
containers:
- name: frontend
image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/frontend:3
image: 975050171672.dkr.ecr.ap-south-1.amazonaws.com/frontend:1
imagePullPolicy: Always
env:
- name: REACT_APP_BACKEND_URL
Expand Down