diff --git a/Jenkins-Pipeline-Code/Jenkinsfile-Backend b/Jenkins-Pipeline-Code/Jenkinsfile-Backend index b0826fb70..53bfff8d2 100644 --- a/Jenkins-Pipeline-Code/Jenkinsfile-Backend +++ b/Jenkins-Pipeline-Code/Jenkinsfile-Backend @@ -1,7 +1,6 @@ pipeline { agent any tools { - jdk 'jdk' nodejs 'nodejs' } environment { @@ -19,7 +18,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/JatinKishore/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' } } stage('Sonarqube Analysis') { @@ -27,8 +26,8 @@ pipeline { dir('Application-Code/backend') { withSonarQubeEnv('sonar-server') { sh ''' $SCANNER_HOME/bin/sonar-scanner \ - -Dsonar.projectName=three-tier-backend \ - -Dsonar.projectKey=three-tier-backend ''' + -Dsonar.projectName=backend \ + -Dsonar.projectKey=backend ''' } } } @@ -82,20 +81,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/JatinKishore/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 = "JatinKishore" } 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 "jatinkm02@gmail.com" + git config user.name "JatinKishore" BUILD_NUMBER=${BUILD_NUMBER} echo $BUILD_NUMBER imageTag=$(grep -oP '(?<=backend:)[^ ]+' deployment.yaml) @@ -110,4 +109,4 @@ pipeline { } } } -} \ No newline at end of file +} diff --git a/Jenkins-Pipeline-Code/Jenkinsfile-Frontend b/Jenkins-Pipeline-Code/Jenkinsfile-Frontend index 9be1a50c0..d51b9e948 100644 --- a/Jenkins-Pipeline-Code/Jenkinsfile-Frontend +++ b/Jenkins-Pipeline-Code/Jenkinsfile-Frontend @@ -1,7 +1,6 @@ pipeline { agent any tools { - jdk 'jdk' nodejs 'nodejs' } environment { @@ -19,7 +18,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/JatinKishore/End-to-End-Kubernetes-Three-Tier-DevSecOps-Project.git' } } stage('Sonarqube Analysis') { @@ -27,8 +26,8 @@ pipeline { dir('Application-Code/frontend') { withSonarQubeEnv('sonar-server') { sh ''' $SCANNER_HOME/bin/sonar-scanner \ - -Dsonar.projectName=three-tier-frontend \ - -Dsonar.projectKey=three-tier-frontend ''' + -Dsonar.projectName=frontend \ + -Dsonar.projectKey=frontend ''' } } } @@ -82,20 +81,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/JatinKishore/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 = "JatinKishore" } 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 "jatinkm02@gmail.com" + git config user.name "JatinKishore" BUILD_NUMBER=${BUILD_NUMBER} echo $BUILD_NUMBER imageTag=$(grep -oP '(?<=frontend:)[^ ]+' deployment.yaml) @@ -110,4 +109,4 @@ pipeline { } } } -} \ No newline at end of file +} diff --git a/Kubernetes-Manifests-file/Backend/deployment.yaml b/Kubernetes-Manifests-file/Backend/deployment.yaml index 5ced3cb5e..2c7ca75c4 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: 820242902661.dkr.ecr.us-east-1.amazonaws.com/backend:4 imagePullPolicy: Always env: - name: MONGO_CONN_STR diff --git a/Kubernetes-Manifests-file/Database/pvc.yaml b/Kubernetes-Manifests-file/Database/pvc.yaml index 13eb7d2b3..5a7981846 100644 --- a/Kubernetes-Manifests-file/Database/pvc.yaml +++ b/Kubernetes-Manifests-file/Database/pvc.yaml @@ -3,10 +3,9 @@ kind: PersistentVolumeClaim metadata: name: mongo-volume-claim namespace: three-tier -spec: - accessModes: +spec: + accessModes: - ReadWriteOnce - storageClassName: "" resources: requests: - storage: 1Gi \ No newline at end of file + storage: 1Gi diff --git a/Kubernetes-Manifests-file/Frontend/deployment.yaml b/Kubernetes-Manifests-file/Frontend/deployment.yaml index 24f73e8c8..182349d3a 100644 --- a/Kubernetes-Manifests-file/Frontend/deployment.yaml +++ b/Kubernetes-Manifests-file/Frontend/deployment.yaml @@ -25,10 +25,10 @@ spec: - name: ecr-registry-secret containers: - name: frontend - image: 407622020962.dkr.ecr.us-east-1.amazonaws.com/frontend:3 + image: 820242902661.dkr.ecr.us-east-1.amazonaws.com/frontend:7 imagePullPolicy: Always env: - name: REACT_APP_BACKEND_URL - value: "http://amanpathakdevops.study/api/tasks" + value: "/api/tasks" ports: - containerPort: 3000 diff --git a/Kubernetes-Manifests-file/ingress.yaml b/Kubernetes-Manifests-file/ingress.yaml index 00526e0c3..483b60acf 100644 --- a/Kubernetes-Manifests-file/ingress.yaml +++ b/Kubernetes-Manifests-file/ingress.yaml @@ -7,12 +7,10 @@ metadata: alb.ingress.kubernetes.io/scheme: internet-facing alb.ingress.kubernetes.io/target-type: ip alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]' - # alb.ingress.kubernetes.io/subnets: "subnet-0aa439b4ddafcca10,subnet-0b95df318219145ca,subnet-0ccca36474902829a" spec: ingressClassName: alb rules: - - host: amanpathakdevops.study - http: + - http: paths: - path: /api pathType: Prefix