Fix deployment.yaml with correct Docker image name

Jenkinsfile

@@ -2,47 +2,74 @@ pipeline {
     agent any
 
     environment {
-        DOCKERHUB_CREDENTIALS = credentials('dockerhub-creds')
+        IMAGE_NAME      = 'myapp'
-        DOCKER_IMAGE = "vipin2025devops/myapp"
+        IMAGE_TAG       = 'latest'
-        K8S_DEPLOYMENT = "k8s/deployment.yaml"
+        DOCKERHUB_USER  = 'vipin2025devops'
+        DEPLOYMENT_FILE = 'k8s/deployment.yaml'
+        SERVICE_FILE    = 'k8s/service.yaml'
+        KUBECONFIG      = 'C:\\Users\\rlkri\\.kube\\config'
     }
 
     stages {
-        stage('Checkout') {
+        stage('Checkout Code') {
             steps {
-                git branch: 'main', url: 'https://git.opsmonsters.in/vipin.p/my-react-app'
+                git branch: 'main',
+                    url: 'https://git.opsmonsters.in/vipin.p/my-react-app.git',
+                    credentialsId: 'git-opsmonsters-cred'
             }
         }
 
-        stage('Build Docker Image') {
+        stage('Build & Push Docker Image') {
             steps {
                 script {
-                    def imageTag = "build-${env.BUILD_NUMBER}"
+                    withCredentials([usernamePassword(credentialsId: 'dockerhub-credentials', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) {
-                    sh "docker build -t ${DOCKER_IMAGE}:${imageTag} ."
+                        bat """
-                    sh "docker tag ${DOCKER_IMAGE}:${imageTag} ${DOCKER_IMAGE}:latest"
+                        echo %DOCKER_PASS% | docker login -u %DOCKER_USER% --password-stdin
-                    env.IMAGE_TAG = imageTag
+                        docker build -t %DOCKER_USER%/%IMAGE_NAME%:%IMAGE_TAG% .
+                        docker push %DOCKER_USER%/%IMAGE_NAME%:%IMAGE_TAG%
+                        """
+                    }
                 }
             }
         }
 
-        stage('Push to DockerHub') {
+        stage('Verify Docker Image') {
             steps {
-                script {
+                bat """
-                    sh "echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin"
+                docker images | findstr %DOCKERHUB_USER%/%IMAGE_NAME%
-                    sh "docker push ${DOCKER_IMAGE}:${IMAGE_TAG}"
+                """
-                    sh "docker push ${DOCKER_IMAGE}:latest"
-                }
             }
         }
 
         stage('Deploy to Kubernetes') {
             steps {
-                script {
+                bat """
-                    sh """
+                kubectl apply -f %DEPLOYMENT_FILE% --validate=false
-                    sed 's|IMAGE_PLACEHOLDER|${DOCKER_IMAGE}:${IMAGE_TAG}|g' ${K8S_DEPLOYMENT} | kubectl apply -f -
+                kubectl apply -f %SERVICE_FILE% --validate=false
-                    """
+                kubectl get pods -o wide
-                }
+                kubectl get svc
+                """
+            }
+        }
+
+        stage('Verify Deployment') {
+            steps {
+                bat """
+                echo Pods Status:
+                kubectl get pods -o wide
+                echo Services:
+                kubectl get svc
+                """
             }
         }
     }
+
+    post {
+        success {
+            echo "Deployment successful!"
+        }
+        failure {
+            echo "Deployment failed. Check logs above."
+        }
+    }
 }

k8s/deployment.yaml

@@ -14,6 +14,6 @@ spec:
     spec:
       containers:
         - name: myapp
-          image: IMAGE_PLACEHOLDER   # Jenkins will replace this
+          image: vipin2025devops/myapp:latest
           ports:
             - containerPort: 3000