From 36795062e02db09474db32797a9246bbeebfc23d Mon Sep 17 00:00:00 2001 From: dxin Date: Thu, 20 Nov 2025 14:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9pod=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile/java/email_Dockerfile | 51 +-- Dockerfile/web/admin_web_Dockerfile | 49 +++ SCM/一条龙/s1_flymoon_admin_web.groovy | 299 ++++++++++++++++++ SCM/一条龙/s1_flymoon_email.groovy | 299 ++++++++++++++++++ .../build_image_flymoon_admin_web.groovy | 227 +++++++++++++ SCM/构建镜像/build_image_flymoon_email.groovy | 45 ++- ...r-kubeconfig => apex-user-kubeconfig.yaml} | 13 +- .../config/apex-user/apex-user-longtoken.yaml | 12 + k8s_yaml/config/apex-user/apex-user-rbac.yaml | 5 +- .../config/apex-user/network-test-pod.yaml | 20 ++ k8s_yaml/s1/s1-flymoon-admin.yaml | 2 +- k8s_yaml/s1/s1-flymoon-agent.yaml | 2 +- k8s_yaml/s1/s1-flymoon-payment.yaml | 2 +- k8s_yaml/s1/s1-lessie-agents.yaml | 2 +- k8s_yaml/s1/s1-lessie-ai-web.yaml | 2 +- k8s_yaml/s1/s1-lessie-go-api.yaml | 2 +- 16 files changed, 956 insertions(+), 76 deletions(-) create mode 100644 Dockerfile/web/admin_web_Dockerfile create mode 100644 SCM/一条龙/s1_flymoon_admin_web.groovy create mode 100644 SCM/一条龙/s1_flymoon_email.groovy create mode 100644 SCM/构建镜像/build_image_flymoon_admin_web.groovy rename k8s_yaml/config/apex-user/{apex-user-kubeconfig => apex-user-kubeconfig.yaml} (58%) create mode 100644 k8s_yaml/config/apex-user/apex-user-longtoken.yaml create mode 100644 k8s_yaml/config/apex-user/network-test-pod.yaml diff --git a/Dockerfile/java/email_Dockerfile b/Dockerfile/java/email_Dockerfile index e41b32e..20eb9e9 100644 --- a/Dockerfile/java/email_Dockerfile +++ b/Dockerfile/java/email_Dockerfile @@ -1,48 +1,23 @@ -# # 使用官方 Java 8 精简镜像（含JDK，适合运行Spring Boot等Java应用） -# FROM mirror.ccs.tencentyun.com/library/openjdk:8-jdk-slim AS runtime - -# # 配置环境变量（解决中文乱码、时区问题） -# ENV LANG=C.UTF-8 \ -# TZ=Asia/Shanghai \ -# JAVA_OPTS="" - -# # 创建应用工作目录 -# WORKDIR /app - -# # 复制主应用JAR 和 API JAR -# COPY /start/target/start-0.0.1-SNAPSHOT.jar /app/flymoon-email.jar -# RUN chmod 755 /app/flymoon-email.jar - -# # 暴露应用端口（根据实际端口修改） -# EXPOSE 4997 4998 - -# # 默认启动环境sit，可被覆盖，外部使用-e or env SPRING_PROFILES_ACTIVE=xxx覆盖 -# ARG RUN_PROFILE=sit-us -# ENV SPRING_PROFILES_ACTIVE=${RUN_PROFILE} - -# # 启动命令（支持外部传入JVM参数，如 -Xms512m -Xmx1024m） -# ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/flymoon-email.jar --spring.profiles.active=${SPRING_PROFILES_ACTIVE}"] - - - - - - - - # ---- Stage 1: Build with Maven ---- -FROM maven:3.9.6-eclipse-temurin-8 AS builder +FROM maven:3.8.8-eclipse-temurin-8 AS builder WORKDIR /build # 先仅复制 pom.xml 用于依赖缓存 +COPY application/pom.xml application/ +COPY domain/pom.xml domain/ +COPY infrastructure-cn/pom.xml infrastructure-cn/ +COPY infrastructure-us/pom.xml infrastructure-us/ +COPY infrastructure/pom.xml infrastructure/ +COPY interface/pom.xml interface/ +COPY start/pom.xml start/ COPY pom.xml . # 预下载所有依赖，pom 不变就不会重新下载 RUN mvn -B dependency:go-offline -# 再复制源码 -COPY src ./src +# 再复制所有源码 +COPY . . # Maven 构建配置变量可变，us 或 cn, 默认为 us ARG MAVEN_BUILD_PROFILE=us @@ -50,7 +25,7 @@ RUN mvn clean package -Dmaven.test.skip=true -P${MAVEN_BUILD_PROFILE} # ---- Stage 2: Runtime ---- -FROM mirror.ccs.tencentyun.com/library/openjdk:8-jdk-slim AS runtime +FROM mirror.ccs.tencentyun.com/library/openjdk:8-jdk AS runtime WORKDIR /app @@ -59,7 +34,7 @@ ENV LANG=C.UTF-8 \ JAVA_OPTS="" # 从构建阶段复制 JAR -COPY --from=builder /start/target/start-0.0.1-SNAPSHOT.jar /app/flymoon-email.jar +COPY --from=builder /build/start/target/start-0.0.1-SNAPSHOT.jar /app/flymoon-email.jar EXPOSE 4997 4998 @@ -67,4 +42,4 @@ EXPOSE 4997 4998 ARG RUN_PROFILE=sit-us ENV SPRING_PROFILES_ACTIVE=${RUN_PROFILE} -ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/app.jar --spring.profiles.active=${SPRING_PROFILES_ACTIVE}"] +ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/flymoon-email.jar --spring.profiles.active=${SPRING_PROFILES_ACTIVE}"] diff --git a/Dockerfile/web/admin_web_Dockerfile b/Dockerfile/web/admin_web_Dockerfile new file mode 100644 index 0000000..0222828 --- /dev/null +++ b/Dockerfile/web/admin_web_Dockerfile @@ -0,0 +1,49 @@ +# =============================== +# 1) 依赖安装 + 构建阶段 +# =============================== +FROM node:16-alpine AS build + +WORKDIR /app + +# 只拷贝 package.json，加快缓存命中 +COPY package.json ./ + +# 预先安装依赖（利用缓存） +RUN npm install --registry=https://registry.npmmirror.com + +# 拷贝全部代码 +COPY . . + +# 通过构建参数传入构建环境（如 sit/test/prod） +ARG BUILD_ENV=sit +ENV BUILD_ENV=${BUILD_ENV} + +# 要求 package.json 中的 script 形如：build:sit, build:test, build:prod +RUN npm run build:${BUILD_ENV} + +# =============================== +# 2) 生产镜像阶段 +# =============================== +FROM nginx:1.25-alpine AS runtime + +# 清理默认 nginx 静态内容 +RUN rm -rf /usr/share/nginx/html/* + +# 拷贝 build 结果 +COPY --from=build /app/dist /usr/share/nginx/html/ + +# 权限 +RUN chmod -R 755 /usr/share/nginx/html + +EXPOSE 80 + +CMD ["nginx", "-g", "daemon off;"] + + + + + + +# docker build \ +# --build-arg BUILD_ENV=${BUILD_ENV} \ +# -t registry.xxx.com/your_project/web:${BUILD_NUMBER} . \ No newline at end of file diff --git a/SCM/一条龙/s1_flymoon_admin_web.groovy b/SCM/一条龙/s1_flymoon_admin_web.groovy new file mode 100644 index 0000000..d948981 --- /dev/null +++ b/SCM/一条龙/s1_flymoon_admin_web.groovy @@ -0,0 +1,299 @@ +pipeline { + agent any + + parameters { + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'Code_branch', + type: 'PT_BRANCH_TAG', + selectedValue: 'DEFAULT', + sortMode: 'NONE', + description: '选择代码分支: ', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + choice( + name: 'NAME_SPACES', + choices: ['sit', 'test', 'prod'], + description: '选择存放镜像的仓库命名空间：' + ) + choice( + name: 'BUILD_ENV', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置, 默认为 npm build:sit 构建' + ) + string( + name: 'CUSTOM_TAG', + defaultValue: '', + description: '可选：自定义镜像 Tag (字母、数字、点、下划线、短横线), 如 v0.0.1, 留空则自动生成 “ v+构建次数_分支名_短哈希_构建时间 ”' + ) + booleanParam( + name: 'DEPLOY_AFTER_BUILD', + defaultValue: false, + description: '是否构建完镜像后部署?' + ) + } + environment { + KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 + + REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 + NAMESPACE = "lessie${params.NAME_SPACES}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "flymoon-admin-web" // 镜像名（固定前缀） + CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + + Deployment_name = "s1-flymoon-admin-web-deployment" // 工作负载名 + Pod_container_name = "flymoon-admin-web" // pod内运行的容器名 + K8s_namespace = "sit" // 这是k8s集群的命名空间 + } + + stages { + stage('拉取代码') { + steps { + git branch: "${params.Code_branch}", + credentialsId: 'fly_gitlab_auth', + url: 'http://106.53.194.199/root/fly_moon_web.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('登录容器仓库') { + 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 \ + --build-arg BUILD_ENV=${params.BUILD_ENV} \ + -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 { + 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 "部署有错误，请检查！" + } + } +} \ No newline at end of file diff --git a/SCM/一条龙/s1_flymoon_email.groovy b/SCM/一条龙/s1_flymoon_email.groovy new file mode 100644 index 0000000..dc3fc75 --- /dev/null +++ b/SCM/一条龙/s1_flymoon_email.groovy @@ -0,0 +1,299 @@ +pipeline { + agent any + + parameters { + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'Code_branch', + type: 'PT_BRANCH_TAG', + selectedValue: 'DEFAULT', + sortMode: 'NONE', + description: '选择代码分支: ', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + choice( + name: 'NAME_SPACES', + choices: ['sit', 'test', 'prod'], + description: '选择存放镜像的仓库命名空间：' + ) + choice( + name: 'MAVEN_BUILD_PROFILE', + choices: ['us', 'cn'], + description: '选择MAVEN构建的配置文件, 默认为 us' + ) + string( + name: 'CUSTOM_TAG', + defaultValue: '', + description: '可选：自定义镜像 Tag (字母、数字、点、下划线、短横线), 如 v0.0.1, 留空则自动生成 “ v+构建次数_分支名_短哈希_构建时间 ”' + ) + booleanParam( + name: 'DEPLOY_AFTER_BUILD', + defaultValue: false, + description: '是否构建完镜像后部署?' + ) + } + environment { + KUBECONFIG = credentials('k8s-test-config-admin') // k8s 凭证 ID, Jenkins 中配置的凭证名称 + + REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 + NAMESPACE = "lessie${params.NAME_SPACES}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "flymoon-email" // 镜像名（固定前缀） + CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + + Deployment_name = "s1-flymoon-email-deployment" // 工作负载名 + Pod_container_name = "flymoon-email" // pod内运行的容器名 + K8s_namespace = "sit" // 这是k8s集群的命名空间 + } + + stages { + stage('拉取代码') { + steps { + git branch: "${params.Code_branch}", + credentialsId: 'fly_gitlab_auth', + url: 'http://106.53.194.199/root/fly_moon_email.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('登录容器仓库') { + 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 \ + --build-arg MAVEN_BUILD_PROFILE=${params.MAVEN_BUILD_PROFILE} \ + -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 { + 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 "部署有错误，请检查！" + } + } +} \ No newline at end of file diff --git a/SCM/构建镜像/build_image_flymoon_admin_web.groovy b/SCM/构建镜像/build_image_flymoon_admin_web.groovy new file mode 100644 index 0000000..6a37aeb --- /dev/null +++ b/SCM/构建镜像/build_image_flymoon_admin_web.groovy @@ -0,0 +1,227 @@ +pipeline { + agent any + + parameters { + gitParameter( + branchFilter: 'origin/(.*)', + defaultValue: 'dxin', + name: 'Code_branch', + type: 'PT_BRANCH_TAG', + selectedValue: 'DEFAULT', + sortMode: 'NONE', + description: '选择代码分支: ', + quickFilterEnabled: true, + tagFilter: '*', + listSize: "1" + ) + choice( + name: 'NAME_SPACES', + choices: ['sit', 'test', 'prod'], + description: '选择存放镜像的仓库命名空间：' + ) + choice( + name: 'BUILD_ENV', + choices: ['sit', 'test', 'prod'], + description: '选择构建的环境配置, 默认为 pnpm build:im 构建' + ) + string( + name: 'CUSTOM_TAG', + defaultValue: '', + description: '可选：自定义镜像 Tag (字母、数字、点、下划线、短横线), 如 v0.0.1, 留空则自动生成 “ v+构建次数_分支名_短哈希_构建时间 ”' + ) + } + environment { + REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 + NAMESPACE = "lessie${params.NAME_SPACES}" // 命名空间根据choices的选择拼接 + IMAGE_NAME = "flymoon-admin-web" // 镜像名（固定前缀） + CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID + } + + stages { + stage('拉取代码') { + steps { + git branch: "${params.Code_branch}", + credentialsId: 'fly_gitlab_auth', + url: 'http://106.53.194.199/root/fly_moon_web.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('登录容器仓库') { + 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 \ + --build-arg BUILD_ENV=${params.BUILD_ENV} \ + -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 { + sh "docker push ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + echo "推送镜像成功：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" + } + } + } + } + + 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 "部署有错误，请检查！" + } + } +} \ No newline at end of file diff --git a/SCM/构建镜像/build_image_flymoon_email.groovy b/SCM/构建镜像/build_image_flymoon_email.groovy index 62da23a..2dc0f62 100644 --- a/SCM/构建镜像/build_image_flymoon_email.groovy +++ b/SCM/构建镜像/build_image_flymoon_email.groovy @@ -1,9 +1,6 @@ pipeline { agent any - tools{ - maven 'mvn3.8.8' - jdk 'jdk21' - } + parameters { gitParameter( branchFilter: 'origin/(.*)', @@ -22,28 +19,36 @@ pipeline { choices: ['sit', 'test', 'prod'], description: '选择存放镜像的仓库命名空间：' ) + choice( + name: 'MAVEN_BUILD_PROFILE', + choices: ['us', 'cn'], + description: '选择MAVEN构建的配置文件, 默认为 us' + ) string( name: 'CUSTOM_TAG', defaultValue: '', - description: '可选：自定义镜像 Tag (字母、数字、点、下划线、短横线), 留空则自动生成 “ v+构建次数_分支名_短哈希_构建时间 ”' + description: '可选：自定义镜像 Tag (字母、数字、点、下划线、短横线), 如 v0.0.1, 留空则自动生成 “ v+构建次数_分支名_短哈希_构建时间 ”' + ) + booleanParam( + name: 'DEPLOY_AFTER_BUILD', + defaultValue: false, + description: '是否构建完镜像后部署?' ) } environment { REGISTRY = "uswccr.ccs.tencentyun.com" // 镜像仓库地址 NAMESPACE = "lessie${params.NAME_SPACES}" // 命名空间根据choices的选择拼接 - IMAGE_NAME = "flymoon-admin" // 镜像名（固定前缀） + IMAGE_NAME = "flymoon-email" // 镜像名（固定前缀） CREDENTIALS_ID = "dxin_img_hub_auth" // 容器仓库凭证ID } - stages { stage('拉取代码') { steps { git branch: "${params.Code_branch}", credentialsId: 'fly_gitlab_auth', - url: 'http://106.53.194.199/root/fly_moon_admin.git' + url: 'http://106.53.194.199/root/fly_moon_email.git' } } - stage('获取信息') { steps { script { @@ -97,7 +102,6 @@ pipeline { confirmed = false } } - if (confirmed) { echo "✅ 用户确认使用自动生成的 Tag：${defaultTag}" env.IMAGE_TAG = defaultTag @@ -111,13 +115,6 @@ pipeline { } } } - - stage('Maven 编译') { - steps { - sh "cd ${WORKSPACE}/ && mvn clean install -Dmaven.test.skip=true" - } - } - stage('登录容器仓库') { steps { withCredentials([usernamePassword( @@ -131,13 +128,14 @@ pipeline { } } } - stage('构建容器镜像') { steps { script { // 构建镜像，添加标签信息 sh """ - docker build -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ + docker build \ + --build-arg MAVEN_BUILD_PROFILE=${params.MAVEN_BUILD_PROFILE} \ + -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG} \ --label "git-branch='${params.Code_branch}'" \ --label "git-commit='${GIT_COMMIT_SHORT}'" \ --label "git-author='${GIT_AUTHOR}'" \ @@ -148,7 +146,6 @@ pipeline { } } } - stage('推送镜像到仓库') { steps { script { @@ -217,15 +214,13 @@ pipeline { } success { // 输出构建结果 - echo "成功！" + echo "镜像构建成功！" echo "镜像地址：${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:${IMAGE_TAG}" echo "对应代码提交：${GIT_COMMIT_SHORT}（${GIT_COMMIT_MSG}）" } failure { // 输出构建结果 - echo "有步骤失败，请检查！" + echo "部署有错误，请检查！" } } -} - - +} \ No newline at end of file diff --git a/k8s_yaml/config/apex-user/apex-user-kubeconfig b/k8s_yaml/config/apex-user/apex-user-kubeconfig.yaml similarity index 58% rename from k8s_yaml/config/apex-user/apex-user-kubeconfig rename to k8s_yaml/config/apex-user/apex-user-kubeconfig.yaml index b88597d..6fcd67e 100644 --- a/k8s_yaml/config/apex-user/apex-user-kubeconfig +++ b/k8s_yaml/config/apex-user/apex-user-kubeconfig.yaml @@ -4,15 +4,16 @@ clusters: - cluster: # kubectl config view --raw -o jsonpath='{.clusters[0].cluster.server}' 获取集群ca certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5akNDQWJLZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQ0FYRFRJMU1UQXhNVEE1TWpFd09Wb1lEekl3TlRVeE1EQTBNRGt5TVRBNVdqQVZNUk13RVFZRApWUVFERXdwcmRXSmxjbTVsZEdWek1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnpFNHZKbXFhLytkWnpDV01QN2RYb3RzREM2RU9Nb2VSSjFSZ3ZvS1F6cFpTLzBpakFqeGEwWHZoRGs5eS91Zi8KWUk3Ukw2WVhxWVQ3c1YyanN5U21JVFVRVXhscGptUHBPb0lQdmltMnRaelBwakI5RDF5d0llWVRzbU11K3loMwpBL1RpU1pQVnVQMFpKNHJCdyt1bU1HQ25FUjJXNVc0WmpuWGV2WndCOWk2WW5oc3FNWVA4azJ6N3RhdnJRSWpOClFuSXlGRUNac3ZMbHlRRlZnR3EyWU9WRERkRUNORXptQjU4Z3NQeFZaOGFTdTZjTVA1MzN4cTNObzJwTWN6cEUKSnRvTEFqZFNCYkU4ZFpBUUFtRXB5WkEwUzJXZnAxK0NYekg0UEhHT2pjVVI0eVQ1T0NQeE5nRGxsenFNVnExOApSQlkvNGI0U3lVbmxHV0luN2tNdWhRSURBUUFCb3lNd0lUQU9CZ05WSFE4QkFmOEVCQU1DQXBRd0R3WURWUjBUCkFRSC9CQVV3QXdFQi96QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFpM3lDWk9zbG1ScVh4eDRkY1BJaXp2K1QKWmRiT05hbHo5S3R2QmlFZHdVKytLRWRaZm5aWlpFMWFPbitxckxPSHpGcGdvblp1eTRKNFlodWRHakFYVE1McwpLWC9WUVZLcndYUVVUMXNybnZVR3FpV21teVZsd1dpUi8yT1A5aHdUVjRaYkVxMzZPMlAvOVJNUXVaYUZDbXZYCm5tcDNYUE5keVVSaHcyeWxVUWJQRGRFKyt0a1B4ZENPOXZlV3VJRUJpQXdaeC9zOFZCZVA2eWNXSjQxdmgrUVMKN2VUbXU1YVFwdllUcWNqMTFycTA1NnMzQlhYUU02TnAvV2tkVStFTHpzT2gwZzhXRU16Q0gvL1lNdFdVWGMyOQo1Z3AzcURNWW1LUW1JSHBIWEtHcEN2OEcvNmFhdWVvWGJnamtFVTRWVkhyWmg3Q1JLZGxsbkhjWU9OemY3UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K server: https://10.0.10.125 - name: cls-pl1yhr34 + name: cls-pl1yhr34 # 给集群起的名字 contexts: - context: cluster: cls-pl1yhr34 namespace: apex-evaluation user: apex-user - name: cls-pl1yhr34-100038894437-context-default -current-context: cls-pl1yhr34-100038894437-context-default + name: apex-user-apex-evaluation # 给上下文起的名字 +current-context: apex-user-apex-evaluation # 当前使用的上下文 users: -- name: apex-user - user: # kubectl create token apex-user -n apex-evaluation 创建token - token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjF5MjNtcUNOVzhsZTlFRUNfQ2NDQ3hjbi1TRV9wS09LYTBzUTA4UU1Yc00ifQ.eyJhdWQiOlsiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXIubG9jYWwiXSwiZXhwIjoxNzYzNDUxMzE2LCJpYXQiOjE3NjM0NDc3MTYsImlzcyI6Imh0dHBzOi8va3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsIiwianRpIjoiNjI4ZDM1MTktMzJjYy00YjkwLWE5ZDEtMTQzYTA3YWFmOWE5Iiwia3ViZXJuZXRlcy5pbyI6eyJuYW1lc3BhY2UiOiJhcGV4LWV2YWx1YXRpb24iLCJzZXJ2aWNlYWNjb3VudCI6eyJuYW1lIjoiYXBleC11c2VyIiwidWlkIjoiNTA4Nzg5YTItZDBmOC00Njg1LTkxZGMtMjNhYjI4NWFmODQ3In19LCJuYmYiOjE3NjM0NDc3MTYsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDphcGV4LWV2YWx1YXRpb246YXBleC11c2VyIn0.fmfLIliz_bNlX6TbRh-ylBfWnIKJJ1eJPB7WjbveOPZVUZToUp14GIaUZd5bA_dncclcfI2UQH0rAFt7xKEvgXioyYDmK5ODkryCTeNV-3mHQsvisN_TUzV3JkDjtuyrA3DKoQ_31N6qp-69vgBvpXiLk_VU9j0Wr--n3EqAv-sFU8wptuGB_8tJiDzpHGhQhNyltNUY8hYY7OsiH8AIPEMxTjbwrJg8eeULBxXOz521u6jO5mpWCDvNsOoQp6luLBtxFWZjoNRH_xhRgfL2tzrwC8RTkiaEXeI_zKNrbC6MactOhfblXjAf44HSEAOO7F_oPBR8ZCJnQnGJ3U3cBQ +- name: apex-user # 给用户起的名字 + user: # kubectl get secret apex-user-longtoken -n apex-evaluation -o jsonpath='{.data.token}' | base64 --decode 查看创建的长token + token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjF5MjNtcUNOVzhsZTlFRUNfQ2NDQ3hjbi1TRV9wS09LYTBzUTA4UU1Yc00ifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJhcGV4LWV2YWx1YXRpb24iLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlY3JldC5uYW1lIjoiYXBleC11c2VyLWxvbmd0b2tlbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhcGV4LXVzZXIiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI1MDg3ODlhMi1kMGY4LTQ2ODUtOTFkYy0yM2FiMjg1YWY4NDciLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6YXBleC1ldmFsdWF0aW9uOmFwZXgtdXNlciJ9.qALi7OsG_MP_fUhgDYYYXQaRNqwoOnzB-UrUURO-x4PCUKcBzavSajBmPXa_XJj9fohF3Y29-hAQwowJzFjv-bWwqBe_1LGhUsyVXWWAZViq3cJywfDfOcluFbHgxMLGUMYWWbgrezuEiHnQXnrHJTZ8MFISTfH6sQnATioOY9sP87nuZYWpsWFoG4X3Hc8d0EkYYVulEFPIKrbFffy5-I0iYPP8EaGF17VjYZCF0g-25VrN6mDgqi3PYiudSQj-KCCs-23CJu3KoMzw2owObaMFqUSEC27Q6F4qMTyK9S7bMttErYkTPjPUtCYSZPGlktErCxEv0sx12XmpPiGCFg + diff --git a/k8s_yaml/config/apex-user/apex-user-longtoken.yaml b/k8s_yaml/config/apex-user/apex-user-longtoken.yaml new file mode 100644 index 0000000..1a2a6f0 --- /dev/null +++ b/k8s_yaml/config/apex-user/apex-user-longtoken.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Secret +metadata: + name: apex-user-longtoken + namespace: apex-evaluation + annotations: + kubernetes.io/service-account.name: apex-user +type: kubernetes.io/service-account-token + + +# 创建完成后： +# kubectl get secret apex-user-longtoken -n apex-evaluation -o yaml \ 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 c76fd09..b594064 100644 --- a/k8s_yaml/config/apex-user/apex-user-rbac.yaml +++ b/k8s_yaml/config/apex-user/apex-user-rbac.yaml @@ -14,8 +14,11 @@ metadata: namespace: apex-evaluation # 绑定到 apex-evaluation 命名空间 rules: - apiGroups: ["", "apps", "extensions", "batch", "networking.k8s.io"] - resources: ["pods", "pods/log", "statefulsets", "deployments", daemonsets, "services", "configmaps", "secrets"] + resources: ["pods", "pods/log", "statefulsets", "deployments", daemonsets, "services", "configmaps", "secrets", "events", "replicasets"] verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] +- apiGroups: ["metrics.k8s.io"] + resources: ["pods","nodes"] + verbs: ["get","list","watch"] --- # 将 apex-evaluation 命名空间的 Role 绑定到 ServiceAccount diff --git a/k8s_yaml/config/apex-user/network-test-pod.yaml b/k8s_yaml/config/apex-user/network-test-pod.yaml new file mode 100644 index 0000000..3006818 --- /dev/null +++ b/k8s_yaml/config/apex-user/network-test-pod.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Pod +metadata: + name: network-test-pod + namespace: apex-evaluation + labels: + app: network-test +spec: + containers: + - name: network-tools + image: nicolaka/netshoot:latest + command: ["/bin/sh"] + args: ["-c", "sleep 3600"] # 保持运行1小时 + resources: + requests: + memory: "64Mi" + cpu: "50m" + limits: + memory: "128Mi" + cpu: "100m" \ No newline at end of file diff --git a/k8s_yaml/s1/s1-flymoon-admin.yaml b/k8s_yaml/s1/s1-flymoon-admin.yaml index 468d35f..c8b46ae 100644 --- a/k8s_yaml/s1/s1-flymoon-admin.yaml +++ b/k8s_yaml/s1/s1-flymoon-admin.yaml @@ -37,7 +37,7 @@ spec: path: /data/logs/flymoon-admin/ type: DirectoryOrCreate containers: - - name: s1-flymoon-admin # 容器名称 + - name: flymoon-admin # 容器名称 image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-admin:v1_dxin_467169b_202511101605 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略 拉 env: diff --git a/k8s_yaml/s1/s1-flymoon-agent.yaml b/k8s_yaml/s1/s1-flymoon-agent.yaml index 36c03a7..b0dbe4f 100644 --- a/k8s_yaml/s1/s1-flymoon-agent.yaml +++ b/k8s_yaml/s1/s1-flymoon-agent.yaml @@ -37,7 +37,7 @@ spec: path: /data/logs/flymoon-agent/ type: DirectoryOrCreate containers: - - name: s1-flymoon-agent # 容器名称 + - name: flymoon-agent # 容器名称 image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-agent:v0.0.5 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略，拉 env: diff --git a/k8s_yaml/s1/s1-flymoon-payment.yaml b/k8s_yaml/s1/s1-flymoon-payment.yaml index d843ecc..eb35fab 100644 --- a/k8s_yaml/s1/s1-flymoon-payment.yaml +++ b/k8s_yaml/s1/s1-flymoon-payment.yaml @@ -37,7 +37,7 @@ spec: path: /data/logs/flymoon-payment/ type: DirectoryOrCreate containers: - - name: s1-flymoon-payment # 容器名称 + - name: flymoon-payment # 容器名称 image: uswccr.ccs.tencentyun.com/lessiesit/flymoon-payment:v2_dxin_d408919_202511121501 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略，总是拉取 env: diff --git a/k8s_yaml/s1/s1-lessie-agents.yaml b/k8s_yaml/s1/s1-lessie-agents.yaml index 91769f6..bc6dcf8 100644 --- a/k8s_yaml/s1/s1-lessie-agents.yaml +++ b/k8s_yaml/s1/s1-lessie-agents.yaml @@ -43,7 +43,7 @@ spec: path: /data/logs/lessie-agents/ type: DirectoryOrCreate containers: - - name: s1-lessie-agents # 容器名称 + - name: lessie-agents # 容器名称 image: uswccr.ccs.tencentyun.com/lessiesit/lessie-sourcing-agents:v0.0.2 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略拉 env: diff --git a/k8s_yaml/s1/s1-lessie-ai-web.yaml b/k8s_yaml/s1/s1-lessie-ai-web.yaml index 64e2821..27ac9ef 100644 --- a/k8s_yaml/s1/s1-lessie-ai-web.yaml +++ b/k8s_yaml/s1/s1-lessie-ai-web.yaml @@ -36,7 +36,7 @@ spec: configMap: name: default-conf containers: - - name: s1-lessie-ai-web + - name: lessie-ai-web image: uswccr.ccs.tencentyun.com/lessiesit/lessie-ai-web:latest imagePullPolicy: Always ports: diff --git a/k8s_yaml/s1/s1-lessie-go-api.yaml b/k8s_yaml/s1/s1-lessie-go-api.yaml index 8276be0..d744992 100644 --- a/k8s_yaml/s1/s1-lessie-go-api.yaml +++ b/k8s_yaml/s1/s1-lessie-go-api.yaml @@ -37,7 +37,7 @@ spec: path: /data/logs/lessie-go-api/ type: DirectoryOrCreate containers: - - name: s1-lessie-go-api # 容器名称 + - name: lessie-go-api # 容器名称 image: uswccr.ccs.tencentyun.com/lessiesit/go_lessie-sourcing-api:v13_dxin_d96a403_202511071407 # 容器镜像 imagePullPolicy: Always # 镜像拉取策略 ,总是拉 env: