Update Jenkinsfile

nest85 · web-flow · commit 69d52c726535 · 2023-02-19T21:01:27.000+08:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -81,12 +81,6 @@ pipeline {
           steps {
               container ('maven') {
                 input(id: 'release-image-with-tag', message: 'release image with tag?')
-                  withCredentials([usernamePassword(credentialsId: "$GITHUB_CREDENTIAL_ID", passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
-                    sh 'git config --global user.email "49383207@qq.com" '
-                    sh 'git config --global user.name "caiwei" '
-                    sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '
-                    sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4'
-                  }
                 sh 'docker tag  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
                 sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '
           }
@@ -100,7 +94,11 @@ pipeline {
           }
           steps {
             input(id: 'deploy-to-production', message: 'deploy to production?')
-            kubernetesDeploy(configs: 'deploy/prod-ol/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID")
+            container('maven') {
+              withCredentials([kubeconfigFile(credentialsId: env.KUBECONFIG_CREDENTIAL_ID, variable: 'KUBECONFIG')]) {
+                sh 'kubectl apply -f deploy/prod-ol/**'
+              }
+            }
           }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,6 @@ pipeline {`
`81`	`81`	`steps {`
`82`	`82`	`container ('maven') {`
`83`	`83`	`input(id: 'release-image-with-tag', message: 'release image with tag?')`
`84`		`- withCredentials([usernamePassword(credentialsId: "$GITHUB_CREDENTIAL_ID", passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {`
`85`		`- sh 'git config --global user.email "49383207@qq.com" '`
`86`		`- sh 'git config --global user.name "caiwei" '`
`87`		`- sh 'git tag -a $TAG_NAME -m "$TAG_NAME" '`
`88`		`- sh 'git push http://$GIT_USERNAME:$GIT_PASSWORD@github.com/$GITHUB_ACCOUNT/devops-java-sample.git --tags --ipv4'`
`89`		`- }`
`90`	`84`	`sh 'docker tag $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '`
`91`	`85`	`sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$TAG_NAME '`
`92`	`86`	`}`
`@@ -100,7 +94,11 @@ pipeline {`
`100`	`94`	`}`
`101`	`95`	`steps {`
`102`	`96`	`input(id: 'deploy-to-production', message: 'deploy to production?')`
`103`		`- kubernetesDeploy(configs: 'deploy/prod-ol/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID")`
	`97`	`+ container('maven') {`
	`98`	`+ withCredentials([kubeconfigFile(credentialsId: env.KUBECONFIG_CREDENTIAL_ID, variable: 'KUBECONFIG')]) {`
	`99`	`+ sh 'kubectl apply -f deploy/prod-ol/**'`
	`100`	`+ }`
	`101`	`+ }`
`104`	`102`	`}`
`105`	`103`	`}`
`106`	`104`	`}`