diff --git a/SCM/部署镜像/1.groovy b/SCM/部署镜像/1.groovy new file mode 100644 index 0000000..5a5bdb4 --- /dev/null +++ b/SCM/部署镜像/1.groovy @@ -0,0 +1,118 @@ + +import groovy.json.JsonSlurper + +def resultHtml = '' // 初始化一个变量来存储最终的 HTML + +try { + // --- 1. 参数处理 --- + def rawInput = IMAGE_NAME ?: '' + def pureTag = rawInput.split(/\s*\|\s*/)[0].trim() + + if (!pureTag) { + resultHtml = '
(请选择镜像 tag)
' + return resultHtml // 立即返回 + } + + // --- 2. 硬编码凭据 --- + def user = '100038894437' // 你的 TCR 用户名 (UIN) + def pass = 'h8H1o6Fd!HLXn' // 你的 TCR 登录密码 + + if (!user || !pass) { + resultHtml = '
❌ 凭据为空
' + return resultHtml // 立即返回 + } + + // --- 3. API 查询 --- + final String REG = "https://uswccr.ccs.tencentyun.com" + final String REPO = "lessiesit/flymoon-email" + + // 3.1. Token + def auth = "Basic " + "${user}:${pass}".bytes.encodeBase64().toString() + def tokenUrl = new URL("${REG}/service/token?service=uswccr&scope=repository:${REPO}:pull") + def tokenConn = tokenUrl.openConnection() + tokenConn.setRequestProperty("Authorization", auth) + tokenConn.connect() + + if (tokenConn.responseCode != 200) { + def errorBody = tokenConn.errorStream?.text ?: "No error body" + resultHtml = "
❌ Token 请求失败 (${tokenConn.responseCode}): ${errorBody.take(200)}
" + return resultHtml // 立即返回 + } + + def tokenJson = new JsonSlurper().parse(tokenConn.inputStream) + def token = tokenJson?.token + + if (!token) { + resultHtml = '
❌ 无法从响应中获取 Token
' + return resultHtml // 立即返回 + } + + // 3.2. Manifest + def manifestUrl = new URL("${REG}/v2/${REPO}/manifests/${pureTag}") + def manifestConn = manifestUrl.openConnection() + manifestConn.setRequestProperty("Authorization", "Bearer ${token}") + manifestConn.setRequestProperty("Accept", "application/vnd.docker.distribution.manifest.v2+json") + manifestConn.connect() + + if (manifestConn.responseCode != 200) { + if (manifestConn.responseCode == 404) { + resultHtml = "
⚠️ Tag '${pureTag}' 不存在
" + return resultHtml // 立即返回 + } + def errorBody = manifestConn.errorStream?.text ?: "No error body" + resultHtml = "
❌ Manifest 请求失败 (${manifestConn.responseCode}): ${errorBody.take(200)}
" + return resultHtml // 立即返回 + } + + def manifestJson = new JsonSlurper().parse(manifestConn.inputStream) + def configDigest = manifestJson?.config?.digest + + if (!configDigest) { + resultHtml = '
❌ Manifest 中无 config.digest
' + return resultHtml // 立即返回 + } + + // 3.3. Config Blob (Labels) + def blobUrl = new URL("${REG}/v2/${REPO}/blobs/${configDigest}") + def blobConn = blobUrl.openConnection() + blobConn.setRequestProperty("Authorization", "Bearer ${token}") + blobConn.connect() + + if (blobConn.responseCode != 200) { + def errorBody = blobConn.errorStream?.text ?: "No error body" + resultHtml = "
❌ Config Blob 请求失败 (${blobConn.responseCode}): ${errorBody.take(200)}
" + return resultHtml // 立即返回 + } + + def configJson = new JsonSlurper().parse(blobConn.inputStream) + def labels = configJson?.config?.Labels ?: [:] + + // --- 4. 格式化输出 --- + // 再次确保 labels 是 Map + if (!(labels instanceof Map)) { + labels = [:] + } + + resultHtml = "
🏷️ Labels for ${pureTag}:
" + if (labels.isEmpty()) { + resultHtml += "（无 Labels）
" + } else { + labels.each { k, v -> + def key = (k != null) ? k.toString() : 'null_key' + def value = (v != null) ? v.toString().replaceAll(/^'|'$/, '') : 'null_value' + resultHtml += "${key}: ${value}
" + } + } + resultHtml += "
" + + // ✅ 修复：在 try 块结束前，确保 resultHtml 是字符串 + resultHtml = resultHtml.toString() + +} catch (Exception e) { + def errorMsg = e.message?.toString() ?: '未知错误' + def errorClass = e.class.simpleName + resultHtml = "
🚨 脚本异常: ${errorClass} - ${errorMsg}
" +} + +// ✅ 修复：确保在所有路径下，最终返回的都是字符串 +return resultHtml.toString() \ No newline at end of file diff --git a/SCM/部署镜像/DM_s1_flymoon_admin.groovy b/SCM/部署镜像/DM_s1_flymoon_admin.groovy deleted file mode 100644 index e74dee4..0000000 --- a/SCM/部署镜像/DM_s1_flymoon_admin.groovy +++ /dev/null @@ -1,287 +0,0 @@ -pipeline { - agent any - - parameters { - imageTag( - name: 'IMAGE_NAME', - description: '此处是 sit 镜像仓库命名空间内的镜像', - registry: 'https://uswccr.ccs.tencentyun.com', - image: 'lessiesit/lessie-sourcing-agents', - credentialId: 'dxin_img_hub_auth', - filter: '.*', - defaultTag: '', - verifySsl: true - ) - booleanParam( - name: 'DEPLOY_AFTER_BUILD', - defaultValue: false, - description: '是否快速回滚上一个版本?' - ) - } - environment { - KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 - - Deployment_name = "s1-flymoon-admin-deployment" // 工作负载名 - Pod_container_name = "s1-flymoon-admin" // pod内运行的容器名 - K8s_namespace = "sit" // 这是k8s集群的命名空间 - } - - stages { - stage('拉取yaml') { - steps { - git branch: "opt", - credentialsId: 'fly_gitlab_auth', - url: 'http://106.53.194.199/opt/opt-config.git' - } - } - - stage('获取信息') { - steps { - script { - // 获取最近一次提交的哈希值（短格式，前8位） - env.GIT_COMMIT_SHORT = sh(script: 'git rev-parse --short HEAD',returnStdout: true).trim() - // 获取最近一次提交的作者 - env.GIT_AUTHOR = sh(script: 'git log -1 --pretty=format:%an',returnStdout: true).trim() - // 获取最近一次提交的时间（格式化） - env.GIT_COMMIT_TIME = sh( - script: 'git log -1 --pretty=format:%ct | xargs -I {} date -d @{} +%Y%m%d-%H%M%S', - returnStdout: true - ).trim() - // 获取最近一次提交的备注信息（转义特殊字符，避免构建失败） - env.GIT_COMMIT_MSG = sh(script: 'git log -1 --pretty=format:%s | sed -e \'s/"/\\"/g\'', returnStdout: true).trim() - - // Jenkins构建次数 - def buildNumber = env.BUILD_NUMBER // Jenkins内置变量，直接获取当前Job的构建序号 - // 当前分支名（处理/为-，如feature/docker_1015 → feature-docker_1015） - def branchName = sh(script: 'git rev-parse --abbrev-ref HEAD', returnStdout: true).trim() - def formattedBranch = branchName.replace('/', '-').replace('_', '-') // 替换分支名中的/和_为- - // 构建时间（格式：202510181215，年-月-日-时-分，无分隔符） - def buildTime = sh(script: 'date +%Y%m%d%H%M', returnStdout: true).trim() - def defaultTag = "v${buildNumber}_${formattedBranch}_${GIT_COMMIT_SHORT}_${buildTime}" - - def customTag = params.CUSTOM_TAG?.trim() - def tagPattern = ~/^[a-zA-Z0-9._-]+$/ - - // 判断最终Tag - if (customTag && customTag ==~ tagPattern) { - echo "✅ 使用自定义镜像 Tag: ${customTag}" - env.IMAGE_TAG = customTag - } else if (customTag) { - echo "⚠️ 自定义 Tag '${customTag}' 不符合规范，将使用默认生成的 Tag: ${defaultTag}" - - def confirmed = true - timeout(time: 1, unit: 'MINUTES') { - try { - input( - message: """⚠️ Tag 命名不规范： - ${customTag} - - 将使用自动生成的 Tag： - ${defaultTag} - - 是否继续构建？""", - ok: '确认' - ) - } catch (err) { - // 用户点击“取消”或中断 - echo "🚫 用户取消构建" - confirmed = false - } - } - - if (confirmed) { - echo "✅ 用户确认使用自动生成的 Tag：${defaultTag}" - env.IMAGE_TAG = defaultTag - } else { - error("流水线已终止。") - } - } else { - env.IMAGE_TAG = defaultTag - echo "未输入自定义 Tag, 使用自动生成规则: ${env.IMAGE_TAG}" - } - } - } - } - - stage('Maven 编译') { - steps { - sh "cd ${WORKSPACE}/ && mvn clean install -Dmaven.test.skip=true" - } - } - - stage('登录容器仓库') { - steps { - withCredentials([usernamePassword( - credentialsId: env.CREDENTIALS_ID, - usernameVariable: 'REGISTRY_USER', - passwordVariable: 'REGISTRY_PWD' - )]) { - sh ''' - echo "$REGISTRY_PWD" | docker login ${REGISTRY} -u ${REGISTRY_USER} --password-stdin - ''' - } - } - } - - stage('构建容器镜像') { - steps { - script { - // 构建镜像，添加标签信息 - sh """ - docker build -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ - --label "git-branch='${params.Code_branch}'" \ - --label "git-commit='${GIT_COMMIT_SHORT}'" \ - --label "git-author='${GIT_AUTHOR}'" \ - --label "git-message='${GIT_COMMIT_MSG}'" \ - --label "build-time='${GIT_COMMIT_TIME}'" \ - . - """ - } - } - } - - stage('推送镜像到仓库') { - steps { - script { - // 推送主镜像（带唯一 Tag） - sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - echo "推送镜像成功：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - } - } - } - - stage('部署到K8S') { - when { - expression { return params.DEPLOY_AFTER_BUILD } - } - steps { - sh """ - echo "=== 更新 Deployment 镜像 ===" - kubectl set image deployment/${Deployment_name} ${Pod_container_name}=${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} -n ${K8s_namespace} - echo "=== 添加注解 ===" - kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${GIT_COMMIT_MSG}" --overwrite -n ${K8s_namespace} - echo "=== 查看历史版本 ===" - kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} - echo "=== 查看所使用的镜像 ===" - kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' - """ - } - } - - stage('检查部署情况') { - when { - expression { return params.DEPLOY_AFTER_BUILD } - } - steps { - echo "检测部署状态并验证新版本运行情况" - sh """ - echo "=== 检查 Deployment 滚动更新状态 ===" - kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=180s - - if [ \$? -ne 0 ]; then - echo "❌ 部署超时或失败，开始收集诊断信息..." - echo "=== 查看当前 Pods 状态 ===" - kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} -o wide - - echo "=== 查看最近的事件 ===" - kubectl get events -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp | tail -n 20 - - echo "=== 查看最近一个失败 Pod 的详细描述 ===" - FAILED_POD=\$(kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} --field-selector=status.phase!=Running -o jsonpath='{.items[0].metadata.name}') - if [ ! -z "\$FAILED_POD" ]; then - kubectl describe pod \$FAILED_POD -n ${K8s_namespace} || true - kubectl logs \$FAILED_POD -n ${K8s_namespace} --tail=50 || true - fi - - echo "=== 回滚到上一个版本 ===" - kubectl rollout undo deployment/${Deployment_name} -n ${K8s_namespace} - - exit 1 - fi - - echo "=== 检查 Pods 是否全部 Ready ===" - kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} -o wide - - echo "=== 获取最新 Pod 名称 ===" - NEW_POD=\$(kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}') - - echo "=== 新 Pod 启动日志(最近20行) ===" - kubectl logs \$NEW_POD -n ${K8s_namespace} --tail=20 || true - - echo "✅ 部署成功：\$NEW_POD 已正常运行" - """ - } - } - - } - - post { - always { - script { - def keepCount = 2 - echo "开始清理本地旧镜像，仅保留最近 ${keepCount} 个构建版本" - def imagePrefix = "${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}" - - // 获取所有镜像（按创建时间排序，越新的越前） - // 格式：Repository:Tag ImageID CreatedAt - def allImagesRaw = sh(script: "docker images ${imagePrefix} --format '{{.Repository}}:{{.Tag}} {{.ID}} {{.CreatedAt}}' | sort -rk3", returnStdout: true).trim() - if (!allImagesRaw) { - echo "未找到任何镜像，无需清理" - return - } - - def allImages = allImagesRaw.split('\n') - if (allImages.size() <= keepCount) { - echo "当前镜像数未超过 ${keepCount} 个，无需清理" - return - } - - def oldImages = allImages.drop(keepCount) - echo "发现 ${oldImages.size()} 个旧镜像需要清理" - oldImages.each { line -> - echo " ${line}" - } - - oldImages.each { line -> - def parts = line.split(' ') - def imageTag = parts[0] - def imageId = parts.size() > 1 ? parts[1] : "" - - // 对于标签为的无效镜像，使用镜像ID删除 - if (imageTag.contains("") && imageId) { - echo "删除无效镜像: ${imageId}" - sh(returnStatus: true, script: "docker rmi -f ${imageId} || true") - } else if (imageId) { - // 对于有标签的有效镜像，优先使用镜像ID删除 - echo "删除旧镜像: ${imageTag} (${imageId})" - sh(returnStatus: true, script: "docker rmi -f ${imageId} || true") - } else { - // 兜底方案，使用标签删除 - echo "删除旧镜像: ${imageTag}" - sh(returnStatus: true, script: "docker rmi -f ${imageTag} || true") - } - } - - echo "清理完成，当前镜像状态：" - sh """ - docker images ${imagePrefix} --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}\\t{{.Size}}' - """ - - sh "docker logout ${REGISTRY}" - echo "容器仓库已登出，本地凭证已清理" - } - } - success { - // 输出构建结果 - echo "成功！" - echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" - echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" - } - failure { - // 输出构建结果 - echo "有步骤失败，请检查！" - } - } -} - - diff --git a/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy new file mode 100644 index 0000000..da3f76e --- /dev/null +++ b/SCM/部署镜像/s1/DM_s1_flymoon_admin.groovy @@ -0,0 +1,214 @@ +pipeline { + agent any + + parameters { + booleanParam( + name: 'DEPLOY_AFTER_BUILD', + defaultValue: false, + description: '是否快速回滚上一个版本?' + ) + choice( + name: 'BRANCH_NAME', + choices: ['dxin', 'opt'], + description: '选择Yaml的分支' + ) + imageTag( + name: 'IMAGE_NAME', + description: '此处是 sit 镜像仓库内的 flymoon-admin 镜像', + registry: 'https://uswccr.ccs.tencentyun.com', + image: 'lessiesit/flymoon-admin', + credentialId: 'dxin_img_hub_auth', + filter: '.*', + defaultTag: '', + verifySsl: true + ) + } + environment { + KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 + IMAGE_FULL_NAME = "uswccr.ccs.tencentyun.com/${IMAGE_NAME}" + Deployment_yaml = "${WORKSPACE}/lessie-ai/sit/s1/flymoon-admin.yaml" + Deployment_name = "s1-flymoon-admin" + K8s_namespace = "sit" + Pod_container_name = "flymoon-admin" + } + stages { + stage('快速回滚上一版本') { + when { + expression { return params.DEPLOY_AFTER_BUILD == true } + } + steps { + script { + sh """ + echo "=== 开始回滚到上一个版本 ===" + kubectl rollout undo deployment/${Deployment_name} -n ${K8s_namespace} + echo "=== 回滚中... ===" + kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=180s + echo "=== 查看所使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + echo "=== 回滚完成 ===" + """ + } + } + } + stage('拉取yaml') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + git branch: "${params.BRANCH_NAME}", + credentialsId: 'fly_gitlab_auth', + url: 'http://172.24.16.20/opt/opt-config.git' + } + } + stage('修改YAML镜像') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + script { + echo "=== 所选择新的镜像: ${params.IMAGE_NAME} ===" + OLD_IMAGE_NAME = sh ( + script: "kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}'", + returnStdout: true + ).trim() + echo "--- 旧镜像: ${OLD_IMAGE_NAME} ---" + sh """ + echo "=== 修改 Deployment YAML 中的镜像版本 ===" + sed -i 's#image:.*#image: ${IMAGE_FULL_NAME}#' ${Deployment_yaml} + """ + } + } + } + stage('部署到k8s') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + script { + def ANNOTATION = "更新 image 为 ${params.IMAGE_NAME}" + sh """ + echo "===Apply Deployment YAML ===" + kubectl apply -f ${Deployment_yaml} -n ${K8s_namespace} + + echo "=== 查看当前新使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + + echo "=== 添加注解 ===" + kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${ANNOTATION}" --overwrite -n ${K8s_namespace} + + echo "=== 查看历史版本 ===" + kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} + """ + } + } + } + stage('检查部署情况') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + script { + echo "=== 检测部署状态并验证新版本运行情况 ===" + echo "--- 检查 Deployment 更新状态 ---" + def rolloutStatus = sh( + script: "kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s", + returnStatus: true + ) + + if (rolloutStatus != 0){ + echo "Deployment ${Deployment_name} 发布 **超时或失败**，开始排查..." + sh """ + echo "--- Deployment 状态 ---" + kubectl describe deployment ${Deployment_name} -n ${K8s_namespace} || true + + echo '--- Pod 列表 ---' + kubectl get pods -n ${K8s_namespace} -l app=${Pod_container_name} -o wide || true + + echo "--- Pod 描述 (describe) ---" + for pod in \$(kubectl get pods -n ${K8s_namespace} -l app=${Pod_container_name} -o jsonpath='{.items[*].metadata.name}'); do + echo "-- Pod 描述 \$pod --" + kubectl describe pod \$pod -n ${K8s_namespace} || true + done + + echo "--- 最近 200 行 Pod 日志 ---" + for pod in \$(kubectl get pods -n ${K8s_namespace} -l app=${Pod_container_name} -o jsonpath='{.items[*].metadata.name}'); do + echo "-- logs \$pod --" + kubectl logs \$pod -n ${K8s_namespace} --tail=200 || true + done + """ + error("=== Deployment 发布失败，请检查以上输出定位问题 ===") + } + + echo "=== 检查 Pods 是否全部 Ready ===" + sh "kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} -o wide" + + echo "=== 获取最新 Pod 名称 ===" + NEW_POD = sh ( + script: "kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}'", + returnStdout: true + ).trim() + + echo "=== 新 Pod 启动日志(最近20行) ===" + sh "kubectl logs ${NEW_POD} -n ${K8s_namespace} --tail=20 || true" + + echo "✅ 部署成功：${NEW_POD} 已正常运行" + } + } + } + stage('生成变更说明') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + script { + def user = currentBuild.getBuildCauses()[0].userName ?: "SYSTEM" + def now = sh(script: "date '+%Y-%m-%d %H:%M:%S'", returnStdout: true).trim() + env.CHANGE_MSG = """ + jenkins执行人: ${user} + 修改时间: ${now} + 旧镜像: ${OLD_IMAGE_NAME} + 新镜像: ${IMAGE_FULL_NAME} + 部署对象: ${Deployment_name} + """.stripIndent() + echo "=== 本次部署变更说明 ===" + echo env.CHANGE_MSG + } + } + } + stage('提交变更记录到 GitLab') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + script { + withCredentials([usernamePassword(credentialsId: 'fly_gitlab_auth', usernameVariable: 'GIT_USER', passwordVariable: 'GIT_PASS')]) { + sh """ + cd ${WORKSPACE} + git config user.name "jenkins" + git config user.email "jenkins@local" + + git add ${Deployment_yaml} + git commit -m "更新镜像 ${CHANGE_MSG}" + + # 生成临时 .netrc 文件 + echo "machine 172.24.16.20 login \$GIT_USER password \$GIT_PASS" > ~/.netrc + chmod 600 ~/.netrc + + git push http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME} + """ + } + } + } + } + } + + post { + success { + echo "成功！" + echo "=== 所选择镜像: ${params.IMAGE_NAME} ===" + } + failure { + echo "有步骤失败，请检查！" + } + } +} \ No newline at end of file diff --git a/SCM/部署镜像/DM_s2_lessie_go_api.groovy b/SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy similarity index 59% rename from SCM/部署镜像/DM_s2_lessie_go_api.groovy rename to SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy index 3984948..64b6d38 100644 --- a/SCM/部署镜像/DM_s2_lessie_go_api.groovy +++ b/SCM/部署镜像/s1/DM_s1_flymoon_agent.groovy @@ -9,14 +9,14 @@ pipeline { ) choice( name: 'BRANCH_NAME', - choices: ['opt'], + choices: ['dxin', 'opt'], description: '选择Yaml的分支' ) imageTag( name: 'IMAGE_NAME', - description: '此处是 sit 镜像仓库内的 go 服务镜像', + description: '此处是 sit 镜像仓库内的 flymoon-agent 镜像', registry: 'https://uswccr.ccs.tencentyun.com', - image: 'lessiesit/go_lessie-sourcing-api', + image: 'lessiesit/flymoon-agent', credentialId: 'dxin_img_hub_auth', filter: '.*', defaultTag: '', @@ -25,10 +25,10 @@ pipeline { } environment { KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 - Deployment_yaml = "${WORKSPACE}/lessie-ai/s2/s2-lessie-go-api.yaml" - Deployment_name = "s2-lessie-go-api-deployment" + Deployment_yaml = "${WORKSPACE}/lessie-ai/sit/s1/flymoon-agent.yaml" + Deployment_name = "s1-flymoon-agent" K8s_namespace = "sit" - Pod_container_name = "s2-lessie-go-api" + Pod_container_name = "flymoon-agent" } stages { stage('快速回滚上一版本') { @@ -56,7 +56,7 @@ pipeline { steps { git branch: "${params.BRANCH_NAME}", credentialsId: 'fly_gitlab_auth', - url: 'http://106.53.194.199/opt/opt-config.git' + url: 'http://172.24.16.20/opt/opt-config.git' } } stage('修改YAML镜像') { @@ -73,52 +73,52 @@ pipeline { } } } - // stage('部署到k8s') { - // when { - // expression { return params.DEPLOY_AFTER_BUILD == false } - // } - // steps { - // script { - // def ANNOTATION = "更新 image 为 ${params.IMAGE_NAME}" - // sh """ - // echo "===Apply Deployment YAML ===" - // kubectl apply -f ${Deployment_yaml} -n ${K8s_namespace} + stage('部署到k8s') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + script { + def ANNOTATION = "更新 image 为 ${params.IMAGE_NAME}" + sh """ + echo "===Apply Deployment YAML ===" + kubectl apply -f ${Deployment_yaml} -n ${K8s_namespace} - // echo "=== 查看当前使用的镜像 ===" - // kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' + echo "=== 查看当前使用的镜像 ===" + kubectl get deployment ${Deployment_name} -n ${K8s_namespace} -o=jsonpath='{.spec.template.spec.containers[*].image}' - // echo "=== 添加注解 ===" - // kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${ANNOTATION}" --overwrite -n ${K8s_namespace} + echo "=== 添加注解 ===" + kubectl annotate deployment/${Deployment_name} kubernetes.io/change-cause="${ANNOTATION}" --overwrite -n ${K8s_namespace} - // echo "=== 查看历史版本 ===" - // kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} - // """ - // } - // } - // } - // stage('检查部署情况') { - // when { - // expression { return params.DEPLOY_AFTER_BUILD == false } - // } - // steps { - // echo "检测部署状态并验证新版本运行情况" - // sh """ - // echo "=== 检查 Deployment 更新状态 ===" - // kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=180s + echo "=== 查看历史版本 ===" + kubectl rollout history deployment/${Deployment_name} -n ${K8s_namespace} + """ + } + } + } + stage('检查部署情况') { + when { + expression { return params.DEPLOY_AFTER_BUILD == false } + } + steps { + echo "检测部署状态并验证新版本运行情况" + sh """ + echo "=== 检查 Deployment 更新状态 ===" + kubectl rollout status deployment/${Deployment_name} -n ${K8s_namespace} --timeout=60s - // echo "=== 检查 Pods 是否全部 Ready ===" - // kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} -o wide + echo "=== 检查 Pods 是否全部 Ready ===" + kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} -o wide - // echo "=== 获取最新 Pod 名称 ===" - // NEW_POD=\$(kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}') + echo "=== 获取最新 Pod 名称 ===" + NEW_POD=\$(kubectl get pods -l app=${Pod_container_name} -n ${K8s_namespace} --sort-by=.metadata.creationTimestamp -o jsonpath='{.items[-1].metadata.name}') - // echo "=== 新 Pod 启动日志(最近20行) ===" - // kubectl logs \$NEW_POD -n ${K8s_namespace} --tail=20 || true + echo "=== 新 Pod 启动日志(最近20行) ===" + kubectl logs \$NEW_POD -n ${K8s_namespace} --tail=20 || true - // echo "✅ 部署成功：\$NEW_POD 已正常运行" - // """ - // } - // } + echo "✅ 部署成功：\$NEW_POD 已正常运行" + """ + } + } stage('生成变更说明') { when { expression { return params.DEPLOY_AFTER_BUILD == false } @@ -154,10 +154,10 @@ pipeline { git commit -m "更新镜像 ${CHANGE_MSG}" # 生成临时 .netrc 文件 - echo "machine 106.53.194.199 login \$GIT_USER password \$GIT_PASS" > ~/.netrc + echo "machine 172.24.16.20 login \$GIT_USER password \$GIT_PASS" > ~/.netrc chmod 600 ~/.netrc - git push http://106.53.194.199/opt/opt-config.git ${params.BRANCH_NAME} + git push http://172.24.16.20/opt/opt-config.git ${params.BRANCH_NAME} """ } } @@ -168,6 +168,7 @@ pipeline { post { success { echo "成功！" + echo "=== 所选择镜像: ${params.IMAGE_NAME} ===" } failure { echo "有步骤失败，请检查！" diff --git a/SCM/部署镜像/test.groovy b/SCM/部署镜像/test.groovy new file mode 100644 index 0000000..52552bc --- /dev/null +++ b/SCM/部署镜像/test.groovy @@ -0,0 +1,62 @@ +pipeline { + agent any + parameters { + // 保留你原有的 Image Tag 插件（用户友好） + imageTag( + name: 'IMAGE_NAME', + description: 'lessiesit/flymoon-email 镜像', + registry: 'https://uswccr.ccs.tencentyun.com', + image: 'lessiesit/flymoon-email', + credentialId: 'dxin_img_hub_auth', // Jenkins 用此凭据注入环境变量 + filter: '.*', + defaultTag: 'latest', + verifySsl: true + ) + } + stages { + stage('🔍 查询镜像 Labels') { + steps { + script { + def pureTag = (params.IMAGE_NAME ?: 'latest').split(/\s+/)[0] + def fullImage = "uswccr.ccs.tencentyun.com/lessiesit/flymoon-email:${pureTag}" + + echo "📌 正在查询镜像 Labels: ${fullImage}" + + // 用 withCredentials 获取凭据（安全注入环境变量） + withCredentials([usernamePassword( + credentialsId: 'dxin_img_hub_auth', + usernameVariable: 'TCR_USER', + passwordVariable: 'TCR_PASS' + )]) { + // 直接调用你的 shell 脚本（已验证成功） + def labelsOutput = sh( + script: """ + set -euo pipefail + /data/sh/get-image-labels.sh '${fullImage}' '${env.TCR_USER}' '${env.TCR_PASS}' + """, + returnStdout: true + ).trim() + + // 将 Labels 存入环境变量，供后续 stage 使用 + env.IMAGE_LABELS = labelsOutput + echo "✅ Labels 查询成功！" + echo labelsOutput + } + } + } + } + + stage('🚀 部署') { + steps { + script { + def pureTag = (params.IMAGE_NAME ?: 'latest').split(/\s+/)[0] + echo "✅ 开始部署镜像: ${pureTag}" + echo "🏷️ Labels (from query): ${env.IMAGE_LABELS}" + + // 你的实际部署命令（示例） + // sh "kubectl set image deployment/flymoon-email email=uswccr.ccs.tencentyun.com/lessiesit/flymoon-email:${pureTag}" + } + } + } + } +} \ No newline at end of file diff --git a/k8s_yaml/config/apex-user/apex-user-rbac.yaml b/k8s_yaml/config/apex-user/apex-user-rbac.yaml index b594064..5fbbcda 100644 --- a/k8s_yaml/config/apex-user/apex-user-rbac.yaml +++ b/k8s_yaml/config/apex-user/apex-user-rbac.yaml @@ -14,7 +14,7 @@ metadata: namespace: apex-evaluation # 绑定到 apex-evaluation 命名空间 rules: - apiGroups: ["", "apps", "extensions", "batch", "networking.k8s.io"] - resources: ["pods", "pods/log", "statefulsets", "deployments", daemonsets, "services", "configmaps", "secrets", "events", "replicasets"] + resources: ["pods", "pods/log", "pods/exec", "statefulsets", "deployments", "daemonsets", "services", "configmaps", "secrets", "events", "replicasets"] verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] - apiGroups: ["metrics.k8s.io"] resources: ["pods","nodes"] diff --git a/旧的二进制部署形式/agent.jar/prod_flymoon_agent_new.groovy b/旧的二进制部署形式/agent.jar/prod_flymoon_agent_new.groovy index a7f2c64..e18909e 100644 --- a/旧的二进制部署形式/agent.jar/prod_flymoon_agent_new.groovy +++ b/旧的二进制部署形式/agent.jar/prod_flymoon_agent_new.groovy @@ -278,7 +278,7 @@ pipeline { } } - stage('启动新服务A') { + stage('启动新服务B') { steps { echo "==========================================" echo "启动新版本服务..." @@ -314,7 +314,7 @@ pipeline { } } - stage('健康检查A') { + stage('健康检查B') { steps { echo "==========================================" echo "执行服务健康检查..."