From 4488db28003b39aeb937cc2b6a2bfcdeef711669 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 26 Mar 2026 17:44:43 +0800 Subject: [PATCH] =?UTF-8?q?pipeline=20vpc=20=E7=BD=91=E7=BB=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-gateway/pipeline | 5 +++-- rc-service/rc-service-console/pipeline | 5 +++-- rc-service/rc-service-external/pipeline | 5 +++-- rc-service/rc-service-live/pipeline | 5 +++-- rc-service/rc-service-order/pipeline | 5 +++-- rc-service/rc-service-other/pipeline | 5 +++-- rc-service/rc-service-wallet/pipeline | 4 ++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/rc-gateway/pipeline b/rc-gateway/pipeline index e714c15c..0622273e 100644 --- a/rc-gateway/pipeline +++ b/rc-gateway/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:gateway-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-gateway-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/gateway" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-gateway/Dockerfile-dev" + DOCKER_FILE = "rc-gateway/Dockerfile" DOCKER_DIR = "rc-gateway" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "gateway" @@ -65,7 +66,7 @@ pipeline { stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl --kubeconfig=/var/jenkins_home/.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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } } diff --git a/rc-service/rc-service-console/pipeline b/rc-service/rc-service-console/pipeline index 3c30996a..a6ebdd14 100644 --- a/rc-service/rc-service-console/pipeline +++ b/rc-service/rc-service-console/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:console-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-service-console-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/console" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-service/rc-service-console/Dockerfile-dev" + DOCKER_FILE = "rc-service/rc-service-console/Dockerfile" DOCKER_DIR = "rc-service/rc-service-console" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "console" @@ -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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } } diff --git a/rc-service/rc-service-external/pipeline b/rc-service/rc-service-external/pipeline index 817e56cd..396568f3 100644 --- a/rc-service/rc-service-external/pipeline +++ b/rc-service/rc-service-external/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:external-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-service-external-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/external" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-service/rc-service-external/Dockerfile-dev" + DOCKER_FILE = "rc-service/rc-service-external/Dockerfile" DOCKER_DIR = "rc-service/rc-service-external" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "external" @@ -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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } } diff --git a/rc-service/rc-service-live/pipeline b/rc-service/rc-service-live/pipeline index f4a51589..4941ec9f 100644 --- a/rc-service/rc-service-live/pipeline +++ b/rc-service/rc-service-live/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:live-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-service-live-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/live" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-service/rc-service-live/Dockerfile-dev" + DOCKER_FILE = "rc-service/rc-service-live/Dockerfile" DOCKER_DIR = "rc-service/rc-service-live" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "live" @@ -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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } } diff --git a/rc-service/rc-service-order/pipeline b/rc-service/rc-service-order/pipeline index 19097f81..9e1e8b76 100644 --- a/rc-service/rc-service-order/pipeline +++ b/rc-service/rc-service-order/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:order-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-service-order-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/order" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-service/rc-service-order/Dockerfile-dev" + DOCKER_FILE = "rc-service/rc-service-order/Dockerfile" DOCKER_DIR = "rc-service/rc-service-order" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "order" @@ -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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } } diff --git a/rc-service/rc-service-other/pipeline b/rc-service/rc-service-other/pipeline index 0bd513df..7e5e1e9f 100644 --- a/rc-service/rc-service-other/pipeline +++ b/rc-service/rc-service-other/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:other-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" @@ -17,7 +18,7 @@ pipeline { JAR_NAME = "rc-service-other-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/other" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-service/rc-service-other/Dockerfile-dev" + DOCKER_FILE = "rc-service/rc-service-other/Dockerfile" DOCKER_DIR = "rc-service/rc-service-other" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "other" @@ -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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } } diff --git a/rc-service/rc-service-wallet/pipeline b/rc-service/rc-service-wallet/pipeline index 04b2dc96..5ddd3b4f 100644 --- a/rc-service/rc-service-wallet/pipeline +++ b/rc-service/rc-service-wallet/pipeline @@ -18,7 +18,7 @@ pipeline { JAR_NAME = "rc-service-wallet-*.jar" ALIYUN_REGISTRY = "tuokemi-con-registry.ap-southeast-1.cr.aliyuncs.com/atyou-prod/wallet" IMAGE_REP_TAG = "" - DOCKER_FILE = "rc-service/rc-service-wallet/Dockerfile-dev" + DOCKER_FILE = "rc-service/rc-service-wallet/Dockerfile" DOCKER_DIR = "rc-service/rc-service-wallet" K8S_NAMESPACE = "prod" K8S_DEPLOYMENT = "wallet" @@ -66,7 +66,7 @@ pipeline { stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -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.replace('tuokemi-con-registry', 'tuokemi-con-registry-vpc')}" } } }