From b188f6c826adc90c9cbf6b8907d016cafbdf05c4 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Mon, 14 Mar 2022 17:35:23 +0800
Subject: [PATCH] deploy 部署文件修改
---
Jenkinsfile | 18 +++++++++++-------
deploy/deploy.yml | 4 ++--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ced08cc..8b795f3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,12 +53,16 @@
}
}
- stage('部署到 dev') {
- steps {
- input(id: 'deploy-to-dev', message: 'deploy to dev?')
- kubernetesDeploy(configs: 'deploy/dev-ol/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID")
- }
- }
+ stage('deploy to dev') {
+ agent none
+ steps {
+ container('maven') {
+ withCredentials([kubeconfigContent(credentialsId : 'kube-zhba' ,variable : 'KUBE_VAR' ,)]) {
+ sh 'kubectl apply -f deploy/deploy.yml'
+ }
+ }
+ }
+ }
stage('deploy to production') {
steps {
@@ -71,7 +75,7 @@
environment {
DOCKER_CREDENTIAL_ID = 'dockerhub-id'
GITHUB_CREDENTIAL_ID = 'github-id'
- KUBECONFIG_CREDENTIAL_ID = 'kube-myf'
+ KUBECONFIG_CREDENTIAL_ID = 'kube-zhba'
REGISTRY = 'registry.cn-hangzhou.aliyuncs.com'
DOCKERHUB_NAMESPACE = 'arsn'
GITHUB_ACCOUNT = 'kubesphere'
diff --git a/deploy/deploy.yml b/deploy/deploy.yml
index 84d5378..a83f1dd 100644
--- a/deploy/deploy.yml
+++ b/deploy/deploy.yml
@@ -25,8 +25,8 @@
imagePullSecrets:
- name: aliyun #提前在项目下配置访问阿里云的账号密码
containers:
-# - image: registry.cn-hangzhou.aliyuncs.com/arsn/myf:SNAPSHOT-50
- - image: $REGISTRY/$DOCKERHUB_NAMESPACE/zhba:SNAPSHOT-$BUILD_NUMBER
+ - image: registry.cn-hangzhou.aliyuncs.com/arsn/zhbaw:SNAPSHOT-4
+# - image: $REGISTRY/$DOCKERHUB_NAMESPACE/zhba:SNAPSHOT-$BUILD_NUMBER
imagePullPolicy: Always
name: app
ports:
--
Gitblit v1.9.3