From 162d718f4a4a07f9c2fa53720d8f7f4e7ef9d1bf Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 12:05:15 +0200 Subject: [PATCH 1/7] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index f004665f..e6beca24 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -5,13 +5,13 @@ stages { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/samplejavaapp' - sh script: '/opt/maven/bin/mvn compile' + sh script: '/usr/share/maven/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/maven/bin/mvn -P metrics pmd:pmd' + sh script: '/usr/share/maven/bin/mvn -P metrics pmd:pmd' } post { success { @@ -33,7 +33,7 @@ stages { stage('package/build-war') { steps { echo 'package......' - sh script: '/opt/maven/bin/mvn package' + sh script: '/usr/share/maven/bin/mvn package' } } stage('build & push docker image') { From 8ce721eaa036e1922a1ff454178f80e4b77f9569 Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 12:05:35 +0200 Subject: [PATCH 2/7] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index e6beca24..950d0ee6 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -38,7 +38,7 @@ stages { } stage('build & push docker image') { steps { - withDockerRegistry(credentialsId: 'DOCKER_HUB_LOGIN', url: 'https://index.docker.io/v1/') { + withDockerRegistry(credentialsId: 'dockercred', url: 'https://index.docker.io/v1/') { sh script: 'cd $WORKSPACE' sh script: 'docker build --file Dockerfile --tag docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER .' sh script: 'docker push docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER' From 980e4ea5e21e6f65e02772782ab89e7e2be02338 Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 12:06:45 +0200 Subject: [PATCH 3/7] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index 950d0ee6..f5aff6b2 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -22,7 +22,7 @@ stages { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/maven/bin/mvn test' + sh script: '/usr/share/maven/bin/mvn test' } post { success { From d44614ae20a8cb213fce757ab8939ff46f03641d Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 13:16:13 +0200 Subject: [PATCH 4/7] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index f5aff6b2..1d834ee5 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -40,7 +40,7 @@ stages { steps { withDockerRegistry(credentialsId: 'dockercred', url: 'https://index.docker.io/v1/') { sh script: 'cd $WORKSPACE' - sh script: 'docker build --file Dockerfile --tag docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER .' + sh script: 'docker build --file Dockerfile --tag docker.io/ekansh22/samplejavaapp:$BUILD_NUMBER .' sh script: 'docker push docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER' } } From 202ce331f7781ca16e420ca55c9b49d6e9200603 Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 13:22:45 +0200 Subject: [PATCH 5/7] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index 1d834ee5..a9f419aa 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -4,7 +4,7 @@ stages { stage('compile') { steps { echo 'compiling..' - git url: 'https://github.com/lerndevops/samplejavaapp' + git url: 'https://github.com/ekansh05/samplejavaapp' sh script: '/usr/share/maven/bin/mvn compile' } } @@ -41,7 +41,7 @@ stages { withDockerRegistry(credentialsId: 'dockercred', url: 'https://index.docker.io/v1/') { sh script: 'cd $WORKSPACE' sh script: 'docker build --file Dockerfile --tag docker.io/ekansh22/samplejavaapp:$BUILD_NUMBER .' - sh script: 'docker push docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER' + sh script: 'docker push docker.io/ekansh22/samplejavaapp:$BUILD_NUMBER' } } } From b20880f09fbfdad32bdfb4af0cf1416cd013db34 Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 15:59:16 +0200 Subject: [PATCH 6/7] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 7377492c..50178519 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -19,7 +19,7 @@ #kubectl delete svc `kubectl get svc | grep sampleapp | awk '{print $1}'` else echo "Creating App Services" - kubectl expose deployment sampleapp --name sampleapp --type NodePort --port 80 --target-port 8080 + kubectl expose deployment sampleapp --name sampleapp --type NodePort --port 80 --target-port 8084 fi - name: increase replicas shell: kubectl scale deploy sampleapp --replicas=2 From 603fcc7e1bd8e914cb1bf0c60a727efef5dd3648 Mon Sep 17 00:00:00 2001 From: ekansh05 <66203108+ekansh05@users.noreply.github.com> Date: Tue, 9 May 2023 17:10:31 +0200 Subject: [PATCH 7/7] Update deploy-kube.yml --- deploy/deploy-kube.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 50178519..a9707e25 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -7,10 +7,10 @@ echo "deleteing previous application deployment" kubectl delete deployment `kubectl get deployment | grep -v NAME | awk '{print $1}' | grep sampleapp` echo "creating new application deployment" - kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} + kubectl create deployment sampleapp --image=ekansh22/samplejavaapp:{{ build }} else echo "Deploying Sampleapp Application" - kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} + kubectl create deployment sampleapp --image=ekansh22/samplejavaapp:{{ build }} fi - name: deploying service shell: |