diff --git a/rc-auth/pipeline b/rc-auth/pipeline index 3caba655..482e637f 100644 --- a/rc-auth/pipeline +++ b/rc-auth/pipeline @@ -9,6 +9,7 @@ pipeline { } environment { + KUBECONFIG = "/var/jenkins_home/.kube/prod-aliyun-config" PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" BUILD_IMAGE = "${sh(script:'echo -n atyou-prod:auth-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-auth-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/auth" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-auth/Dockerfile-dev" + DOCKER_FILE = "rc-auth/Dockerfile" DOCKER_DIR = "rc-auth" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "auth" @@ -65,7 +66,7 @@ pipeline { stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl --kubeconfig=/root/.kube/prod-aliyun-config -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" } } } diff --git a/rc-service/rc-service-wallet/pipeline b/rc-service/rc-service-wallet/pipeline index a1133a15..04b2dc96 100644 --- a/rc-service/rc-service-wallet/pipeline +++ b/rc-service/rc-service-wallet/pipeline @@ -9,6 +9,7 @@ pipeline { } environment { + KUBECONFIG = "/var/jenkins_home/.kube/prod-aliyun-config" PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" BUILD_IMAGE = "${sh(script:'echo -n atyou-prod:wallet-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -65,7 +66,7 @@ pipeline { stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl --kubeconfig=/root/.kube/prod-aliyun-config -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" } } }