From 09aad85ecee741afa1397b1af3f846902fa2089b Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Wed, 16 Mar 2022 15:21:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?ci:=20=E6=9C=89=E6=9D=A5=E4=B8=8Ak8s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devops/DockerJenkinsFile | 191 ++++++++++++++++++ devops/K8sJenkinsFile | 117 +++++++++++ devops/SonarQubeJenkinsFile | 46 +++++ devops/deploy.sh | 20 ++ devops/deploy.yaml | 105 ++++++++++ mall-oms/oms-boot/pom.xml | 6 + .../src/main/resources/bootstrap-k8s.yml | 23 +++ mall-pms/pms-boot/pom.xml | 6 + .../src/main/resources/bootstrap-k8s.yml | 22 ++ mall-sms/sms-boot/pom.xml | 2 + .../src/main/resources/bootstrap-k8s.yml | 23 +++ mall-ums/ums-boot/pom.xml | 2 + .../src/main/resources/bootstrap-k8s.yml | 21 ++ youlai-admin/admin-boot/pom.xml | 2 + .../src/main/resources/bootstrap-k8s.yml | 22 ++ youlai-auth/pom.xml | 2 + .../src/main/resources/bootstrap-k8s.yml | 21 ++ youlai-gateway/pom.xml | 4 +- .../src/main/resources/bootstrap-k8s.yml | 20 ++ 19 files changed, 654 insertions(+), 1 deletion(-) create mode 100644 devops/DockerJenkinsFile create mode 100644 devops/K8sJenkinsFile create mode 100644 devops/SonarQubeJenkinsFile create mode 100644 devops/deploy.sh create mode 100644 devops/deploy.yaml create mode 100644 mall-oms/oms-boot/src/main/resources/bootstrap-k8s.yml create mode 100644 mall-pms/pms-boot/src/main/resources/bootstrap-k8s.yml create mode 100644 mall-sms/sms-boot/src/main/resources/bootstrap-k8s.yml create mode 100644 mall-ums/ums-boot/src/main/resources/bootstrap-k8s.yml create mode 100644 youlai-admin/admin-boot/src/main/resources/bootstrap-k8s.yml create mode 100644 youlai-auth/src/main/resources/bootstrap-k8s.yml create mode 100644 youlai-gateway/src/main/resources/bootstrap-k8s.yml diff --git a/devops/DockerJenkinsFile b/devops/DockerJenkinsFile new file mode 100644 index 000000000..510bdf73b --- /dev/null +++ b/devops/DockerJenkinsFile @@ -0,0 +1,191 @@ +properties([ + parameters([ + [$class: "ChoiceParameterDefinition", + description: "你需要选择哪条分支进行构建?", + name: "branch_name", + choices: ["youlai_k8s_deploy", "master"] + ], + [$class: "ChoiceParameter", + choiceType: "PT_SINGLE_SELECT", + description: "你需要选择哪个微服务模块进行构建?", + filterLength: 1, + filterable: false, + name: "module_name", + randomName: "choice-parameter-5631314439613978", + script: [ + $class: "GroovyScript", + fallbackScript: [ + classpath: [], + sandbox: false, + script: + '''return["Could not get module_name"]''' + ], + script: [ + classpath: [], + sandbox: false, + script: + '''return["youlai-gateway", "youlai-auth","youlai-admin/admin-boot","mall-oms/oms-boot","mall-pms/pms-boot","mall-sms/sms-boot","mall-ums/ums-boot"] + ''' + ] + ] + ], + [$class: "CascadeChoiceParameter", + choiceType: "PT_SINGLE_SELECT", + description: "你需要选择哪台机器进行部署微服务?", + filterLength: 1, + filterable: false, + name: "deploy_on", + randomName: "choice-parameter-5631314456178619", + referencedParameters: "module_name", + script: [ + $class: "GroovyScript", + fallbackScript: [ + classpath: [], + sandbox: false, + script: + '''return["Could not get Environment from module_name Param"]''' + ], + script: [ + classpath: [], + sandbox: false, + script: + '''if (module_name.equals("youlai-gateway")){ + return["a.youlai.tech"] + } + else if(module_name.equals("mall-ums/ums-boot")){ + return["c.youlai.tech"] + } + else if(module_name.equals("mall-oms/oms-boot")){ + return["d.youlai.tech"] + } + else { + return["f.youlai.tech"] + } + ''' + ] + ] + ] + ]) +]) +// 以上代码，需要插件支持，主要作用是：选择具体的微服务，部署至对应的机器 + +pipeline { // 直接上机器，在机器上启容器 + agent { + node { + label "maven" + } + } + + environment { + // 自建harbor仓库的namespace + docker_hub_namespace = "youlai" + // docker_hub_namespace = "youlaiwuhui" + + // 自建镜像仓库地址 + docker_hub = "k8s-harbor:30002" + docker_hub_ext = "harbor.howlaisi.com:30002" + // docker_hub = "https://registry.cn-hangzhou.aliyuncs.com" + + // 在jenknis或kubesphere上面的凭证 + docker_hub_id = "youlai-zhangjialin-myself-harbor-account" + // docker_hub_id = "zhangjialin-aliyun-pingzheng" + + // k8s 上面的 namespace + k8s_namespace = "youlai-mall" + GIT_COMMIT_ID = sh(returnStdout: true, script: 'git rev-parse --short HEAD').trim() + // BUILD_NUMBER 这个变量从jenkins传递过来 + current_build_number = "${BUILD_NUMBER}" + // 在k8s上面配置的id + KUBECONFIG_CREDENTIAL_ID = "youlai-kubeconfig" + } + + stages { + stage ("打印相关变量") { + steps{ + echo "docker_hub_namespace信息为: ${docker_hub_namespace}" + // 获取commit信息，用于后面打tag + echo "commit信息为：${env.GIT_COMMIT_ID}" + echo "current_build_number信息为：${env.current_build_number}" + script { + // 因为传递过来的module有可能是youlai-admin/admin-boot形式的，打镜像时会失败 + env.module_name_prefix = "${module_name}".split("/")[0] + env.module_name_suffix = "${module_name}".split("/")[-1] + // 本端tag名 + env.local_tag = "${module_name_suffix}:${current_build_number}_${GIT_COMMIT_ID}" + // 远端tag名，必须以这种方式命令，才能push到远端 + env.remote_tag = "${docker_hub}/${docker_hub_namespace}/${local_tag}" + // 外网访问下载的远端tag + env.remote_tag_ext = "${docker_hub_ext}/${docker_hub_namespace}/${local_tag}" + echo "module_name信息为: ${module_name}" + echo "module_name_prefix信息为: ${module_name_prefix}" + echo "module_name_suffix信息为: ${module_name_suffix}" + echo "local_tag信息为：${env.local_tag}" + echo "remote_tag信息为：${env.remote_tag}" + echo "remote_tag_ext信息为：${env.remote_tag_ext}" + } + } + } + stage("checkout代码") { + steps { + //git branch: "${branch_name}", credentialsId: 'zhangjialin-youlai-mall-pingzheng', url: 'https://gitee.com/youlaitech/youlai-mall.git' + + //checkout([ + //$class: 'GitSCM', + //branches: [[name: "${branch_name}"]], + //extensions: [[$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true]], + //userRemoteConfigs: [[credentialsId: 'zhangjialin-youlai-mall-pingzheng', url: 'https://gitee.com/youlaitech/youlai-mall.git']]]) + sh "du -h --max-depth=1" + } + } + stage("读取maven配置"){ + steps { + script { + // 需要用到插件Pipeline Utility Steps，参考：https://www.jianshu.com/p/29403ecf7fc2 + def pom = readMavenPom file: "${module_name}/pom.xml" + def properties = pom.properties + env.service_port = properties["service.port"] + env.service_nodeport = properties["service.nodeport"] + sh "echo service_port: ${service_port}" + sh "echo service_nodeport: ${service_nodeport}" + } + } + } + stage("打包镜像") { + steps { + script { + container ('maven') { + // 最外边 + sh "mvn clean install -Dmaven.test.skip=true" + sh "mvn -f ${module_name} clean package dockerfile:build -Ddockerfile.tag=${current_build_number}_${GIT_COMMIT_ID} -Dmaven.test.skip=true -Dspring.profiles.active=dev" + withCredentials([usernamePassword(credentialsId: "${docker_hub_id}", passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) { + sh 'echo "$DOCKER_PASSWORD" | docker login http://k8s-harbor:30002 -u "$DOCKER_USERNAME" --password-stdin' + sh "docker tag ${env.local_tag} ${env.remote_tag}" + sh "docker push ${env.remote_tag}" + } + } + } + } + } + stage("自动部署至docker容器") { + agent none + steps { + script { + panlong_deploy_script_url = "\'https://gitee.com/youlaitech/youlai-mall/raw/${branch_name}/deploy.sh?access_token=a646170fbfafe84d3412ff594d530b6d&ref=${branch_name}\'" + script_dir = "/opt/youlai/script" + withCredentials([usernamePassword(credentialsId: "${docker_hub_id}", passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) { + sshPublisher(publishers: [ + sshPublisherDesc( + configName: "${deploy_on}", + transfers: [ + sshTransfer(cleanRemote: false, + excludes: '', + execCommand: "mkdir -p ${script_dir} && cd ${script_dir} && rm -rf deploy.sh.${module_name_suffix} && curl -X GET --header 'Content-Type: application/json;charset=UTF-8' ${panlong_deploy_script_url} -o deploy.sh.${module_name_suffix} && sh deploy.sh.${module_name_suffix} ${remote_tag_ext} ${service_port} ${docker_hub_namespace} ${module_name_suffix} ${DOCKER_USERNAME} ${DOCKER_PASSWORD}",execTimeout: 1200000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '')], + usePromotionTimestamp: false, + useWorkspaceInPromotion: false, + verbose: true)]) + } + } + } + } + } +} diff --git a/devops/K8sJenkinsFile b/devops/K8sJenkinsFile new file mode 100644 index 000000000..f5e22e573 --- /dev/null +++ b/devops/K8sJenkinsFile @@ -0,0 +1,117 @@ +pipeline { // 直接上k8s，用k8s来管理docker + agent { + node { + label "maven" + } + } + + parameters { + choice( + description: "你需要选择哪条分支进行构建?", + name: "branch_name", + choices: ["feature/youlai_k8s_deploy3", "master", "feature/youlai_k8s_deploy"] + ) + choice( + description: "你需要选择哪个微服务模块进行构建?", + name: "module_name", + choices: ["youlai-gateway", "youlai-auth","youlai-admin/admin-boot","mall-oms/oms-boot","mall-pms/pms-boot","mall-sms/sms-boot","mall-ums/ums-boot"] + ) + } + environment { + // 自建harbor仓库的namespace + docker_hub_namespace = "youlai" + // docker_hub_namespace = "youlaiwuhui" + + // 自建镜像仓库地址 + docker_hub = "k8s-harbor:30002" + // docker_hub = "https://registry.cn-hangzhou.aliyuncs.com" + + // 在jenknis或kubesphere上面的凭证 + docker_hub_id = "youlai-zhangjialin-myself-harbor-account" + // docker_hub_id = "zhangjialin-aliyun-pingzheng" + + // k8s 上面的 namespace + k8s_namespace = "youlai-mall" + GIT_COMMIT_ID = sh(returnStdout: true, script: 'git rev-parse --short HEAD').trim() + // BUILD_NUMBER 这个变量从jenkins传递过来 + current_build_number = "${BUILD_NUMBER}" + // 在k8s上面配置的id + KUBECONFIG_CREDENTIAL_ID = "youlai-kubeconfig" + } + + stages { + stage ("打印相关变量") { + steps{ + echo "docker_hub_namespace信息为: ${docker_hub_namespace}" + // 获取commit信息，用于后面打tag + echo "commit信息为：${env.GIT_COMMIT_ID}" + echo "current_build_number信息为：${env.current_build_number}" + script { + // 因为传递过来的module有可能是youlai-admin/admin-boot形式的，打镜像时会失败 + env.module_name_prefix = "${module_name}".split("/")[0] + env.module_name_suffix = "${module_name}".split("/")[-1] + // 本端tag名 + env.local_tag = "${module_name_suffix}:${current_build_number}_${GIT_COMMIT_ID}" + // 远端tag名，必须以这种方式命令，才能push到远端 + env.remote_tag = "${docker_hub}/${docker_hub_namespace}/${local_tag}" + echo "module_name信息为: ${module_name}" + echo "module_name_prefix信息为: ${module_name_prefix}" + echo "module_name_suffix信息为: ${module_name_suffix}" + echo "local_tag信息为：${env.local_tag}" + echo "remote_tag信息为：${env.remote_tag}" + } + } + } + stage("checkout代码") { + steps { + //git branch: "${branch_name}", credentialsId: 'zhangjialin-youlai-mall-pingzheng', url: 'https://gitee.com/youlaitech/youlai-mall.git' + + //checkout([ + //$class: 'GitSCM', + //branches: [[name: "${branch_name}"]], + //extensions: [[$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true]], + //userRemoteConfigs: [[credentialsId: 'zhangjialin-youlai-mall-pingzheng', url: 'https://gitee.com/youlaitech/youlai-mall.git']]]) + sh "du -h --max-depth=1" + } + } + stage("读取maven配置"){ + steps { + script { + // 需要用到插件Pipeline Utility Steps，参考：https://www.jianshu.com/p/29403ecf7fc2 + def pom = readMavenPom file: "${module_name}/pom.xml" + def properties = pom.properties + env.service_port = properties["service.port"] + env.service_nodeport = properties["service.nodeport"] + sh "echo service_port: ${service_port}" + sh "echo service_nodeport: ${service_nodeport}" + } + } + } + stage("打包镜像") { + steps { + script { + container ('maven') { + // 最外边 + sh "mvn clean install -Dmaven.test.skip=true" + sh "cd $module_name && docker build -t ${env.local_tag} -f ./Dockerfile ." + //sh "mvn -f ${module_name} clean package dockerfile:build -Ddockerfile.tag=${current_build_number}_${GIT_COMMIT_ID} -Dmaven.test.skip=true -Dspring.profiles.active=k8s" + withCredentials([usernamePassword(credentialsId: "${docker_hub_id}", passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) { + sh 'echo "$DOCKER_PASSWORD" | docker login http://k8s-harbor:30002 -u "$DOCKER_USERNAME" --password-stdin' + sh "docker tag ${env.local_tag} ${env.remote_tag}" + sh "docker push ${env.remote_tag}" + } + } + } + } + } + stage("自动部署至k8s") { + agent none + steps { + container ("maven") { + // 这种方式启k8s是官方推荐的 + sh 'envsubst < devops/deploy.yaml | kubectl apply -f -' + } + } + } + } +} \ No newline at end of file diff --git a/devops/SonarQubeJenkinsFile b/devops/SonarQubeJenkinsFile new file mode 100644 index 000000000..5347f1634 --- /dev/null +++ b/devops/SonarQubeJenkinsFile @@ -0,0 +1,46 @@ +pipeline { // 直接上k8s，用k8s起docker来扫描代码 + agent { + node { + label "maven" + } + } + parameters { + choice( + description: "你需要选择哪条分支进行扫描?", + name: "branch_name", + choices: ["youlai_k8s_deploy", "master"] + ) + } + stages { + stage("项目编译") { + agent none + steps { + container("maven") { + sh "ls -al" + sh "mvn clean install -Dmaven.test.skip=true" + } + } + } + stage("代码扫描") { + steps { + script { + container ("maven") { + withCredentials([string(credentialsId : "youlai-youlai-mall-sonar-token" ,variable : "SONAR_TOKEN" ,)]) { + withSonarQubeEnv("sonar") { + sh "mvn sonar:sonar -Dsonar.projectKey=youlai-mall -Dsonar.projectName=youlai-mall -f ./pom.xml -Dsonar.host.url=http://ks.howlaisi.com:31452/ -Dsonar.login=${SONAR_TOKEN}" + } + } + } + } + } + } + } + post { + failure { + addGiteeMRComment comment: ":x: Jenkins CI 构建失败。 [BUILD](" + env.BUILD_URL + ")" + } + success { + addGiteeMRComment comment: """:white_check_mark: Jenkins CI构建通过--> [BUILD](""" + env.BUILD_URL + """)""" + """\n""" + """:white_check_mark: sonar扫描结果--> [SONAR](""" + """http://ks.howlaisi.com:31452/dashboard?id=youlai-mall""" + """)""" + } + } +} \ No newline at end of file diff --git a/devops/deploy.sh b/devops/deploy.sh new file mode 100644 index 000000000..a770e46b3 --- /dev/null +++ b/devops/deploy.sh @@ -0,0 +1,20 @@ +#!/bin/bash +remote_tag_ext=$1 +port=$2 +docker_hub_namespace=$3 +module_name_suffix=$4 +DOCKER_USERNAME=$5 +DOCKER_PASSWORD=$6 +# 登陆harbor +echo "$DOCKER_PASSWORD" | docker login http://harbor.howlaisi.com:30002 -u "$DOCKER_USERNAME" --password-stdin +# 停掉容器 +if [ -n "$docker_hub_namespace" -a -n "$module_name_suffix" ] +then + docker stop $(docker ps -a | grep "${docker_hub_namespace}_${module_name_suffix}" | awk '{print $1}') || true + docker rm -f $(docker ps -a | grep "${docker_hub_namespace}_${module_name_suffix}" | awk '{print $1}') || true + docker rmi -f $(docker images -a | grep "${module_name_suffix}" | awk '{print $3}') || true +fi +# 拉取最新镜像 +docker pull "${remote_tag_ext}" +# 运行容器 +docker run --restart=always -di --net=host -e "SPRING_PROFILES_ACTIVE=dev" --name="${docker_hub_namespace}_${module_name_suffix}" "${remote_tag_ext}" \ No newline at end of file diff --git a/devops/deploy.yaml b/devops/deploy.yaml new file mode 100644 index 000000000..4b9daa947 --- /dev/null +++ b/devops/deploy.yaml @@ -0,0 +1,105 @@ +#apiVersion: v1 +#kind: PersistentVolumeClaim +#metadata: +# namespace: youlai-mall +# name: ${module_name_suffix}-pvc0 +# labels: {} +#spec: +# accessModes: +# - ReadWriteOnce +# resources: +# requests: +# storage: 1Gi # k8s限制，只能扩容，对于pvc，只能扩容，不能缩容，且配置sc.yaml时需要指定allowVolumeExpansion: true #增加该字段表示允许动态扩容 +# storageClassName: nfs-storage +# +#--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: ${module_name_suffix} + name: ${module_name_suffix}-deployment + namespace: ${k8s_namespace} #一定要写名称空间 +spec: + progressDeadlineSeconds: 600 + replicas: 1 + selector: + matchLabels: + app: ${module_name_suffix} + strategy: # 更新策略 + rollingUpdate: + maxSurge: 50% + maxUnavailable: 50% + type: RollingUpdate + template: + metadata: + labels: + app: ${module_name_suffix} + spec: + volumes: # 挂载卷 + - name: host-time # 挂载主机上的时区 + hostPath: + path: /etc/localtime + type: '' +# - name: volume-${module_name_suffix} # 挂载日志 +# persistentVolumeClaim: +# claimName: ${module_name_suffix}-pvc0 + imagePullSecrets: + - name: ${docker_hub_id} #提前在项目下配置访问阿里云或harbor的账号密码 + containers: + - image: $remote_tag + imagePullPolicy: Always + name: ${module_name_suffix} + ports: + - name: http-${service_port} + containerPort: ${service_port} + protocol: TCP + env: + - name: SPRING_PROFILES_ACTIVE + value: k8s + resources: # 资源限制 + limits: + cpu: 250m + memory: 512Mi + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - name: host-time + readOnly: true + mountPath: /etc/localtime +# - name: volume-${module_name_suffix} +# mountPath: /logs + + dnsPolicy: ClusterFirst + restartPolicy: Always + terminationGracePeriodSeconds: 30 + affinity: # 节点亲合性，这下面表达的意思是，尽量散到不同的机器上 + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 100 + podAffinityTerm: + labelSelector: + matchLabels: + app: ${module_name_suffix} + topologyKey: kubernetes.io/hostname + revisionHistoryLimit: 2 #deploy 升级最大记录数由 revisionHistoryLimit 定义,默认值为 10 +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: ${module_name_suffix} + name: ${module_name_suffix}-svc + namespace: ${k8s_namespace} +spec: + ports: + - name: http + port: ${service_port} + protocol: TCP + targetPort: ${service_port} + nodePort: ${service_nodeport} + selector: + app: ${module_name_suffix} + sessionAffinity: None + type: NodePort + diff --git a/mall-oms/oms-boot/pom.xml b/mall-oms/oms-boot/pom.xml index 347497ff2..dbf3cd4fd 100644 --- a/mall-oms/oms-boot/pom.xml +++ b/mall-oms/oms-boot/pom.xml @@ -11,6 +11,12 @@ oms-boot + + 2.0.0 + 8603 + 32000 + + diff --git a/mall-oms/oms-boot/src/main/resources/bootstrap-k8s.yml b/mall-oms/oms-boot/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..695cefb8d --- /dev/null +++ b/mall-oms/oms-boot/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,23 @@ +server: + port: 8603 + +spring: + main: + allow-circular-references: true + mvc: + pathmatch: + matching-strategy: ant_path_matcher + cloud: + nacos: + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true + + diff --git a/mall-pms/pms-boot/pom.xml b/mall-pms/pms-boot/pom.xml index 50d9a99f9..76d96b38e 100644 --- a/mall-pms/pms-boot/pom.xml +++ b/mall-pms/pms-boot/pom.xml @@ -11,6 +11,12 @@ pms-boot + + 2.0.0 + 8802 + 32001 + + diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap-k8s.yml b/mall-pms/pms-boot/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..79d8a30d9 --- /dev/null +++ b/mall-pms/pms-boot/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,22 @@ +server: + port: 8802 + +spring: + main: + allow-circular-references: true + mvc: + pathmatch: + matching-strategy: ant_path_matcher + cloud: + nacos: + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + # 公共配置 + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true diff --git a/mall-sms/sms-boot/pom.xml b/mall-sms/sms-boot/pom.xml index 9622d25ec..619819bd3 100644 --- a/mall-sms/sms-boot/pom.xml +++ b/mall-sms/sms-boot/pom.xml @@ -12,6 +12,8 @@ sms-boot 2.0.0 + 8804 + 32002 diff --git a/mall-sms/sms-boot/src/main/resources/bootstrap-k8s.yml b/mall-sms/sms-boot/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..64ab6fdba --- /dev/null +++ b/mall-sms/sms-boot/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,23 @@ +server: + port: 8804 + +spring: + main: + allow-circular-references: true + mvc: + pathmatch: + matching-strategy: ant_path_matcher + cloud: + nacos: + # 注册中心 + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + # 配置中心 + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true \ No newline at end of file diff --git a/mall-ums/ums-boot/pom.xml b/mall-ums/ums-boot/pom.xml index 8bc8cf0b8..804ff9c94 100644 --- a/mall-ums/ums-boot/pom.xml +++ b/mall-ums/ums-boot/pom.xml @@ -13,6 +13,8 @@ 2.0.0 + 8601 + 32003 diff --git a/mall-ums/ums-boot/src/main/resources/bootstrap-k8s.yml b/mall-ums/ums-boot/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..41881b190 --- /dev/null +++ b/mall-ums/ums-boot/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,21 @@ +server: + port: 8601 + +spring: + main: + allow-circular-references: true + mvc: + pathmatch: + matching-strategy: ant_path_matcher + cloud: + nacos: + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true diff --git a/youlai-admin/admin-boot/pom.xml b/youlai-admin/admin-boot/pom.xml index 0200b3616..403f0032c 100644 --- a/youlai-admin/admin-boot/pom.xml +++ b/youlai-admin/admin-boot/pom.xml @@ -13,6 +13,8 @@ 2.0.0 + 8800 + 32004 diff --git a/youlai-admin/admin-boot/src/main/resources/bootstrap-k8s.yml b/youlai-admin/admin-boot/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..29ecd15d1 --- /dev/null +++ b/youlai-admin/admin-boot/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,22 @@ +server: + port: 8800 + +spring: + main: + allow-circular-references: true + mvc: + pathmatch: + matching-strategy: ant_path_matcher + cloud: + nacos: + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true + diff --git a/youlai-auth/pom.xml b/youlai-auth/pom.xml index 67afbfc80..96eaca4f4 100644 --- a/youlai-auth/pom.xml +++ b/youlai-auth/pom.xml @@ -13,6 +13,8 @@ 2.0.0 + 8000 + 32005 diff --git a/youlai-auth/src/main/resources/bootstrap-k8s.yml b/youlai-auth/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..784e3f61e --- /dev/null +++ b/youlai-auth/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,21 @@ +server: + port: 8000 + +spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + cloud: + nacos: + # 注册中心 + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + # 配置中心 + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true \ No newline at end of file diff --git a/youlai-gateway/pom.xml b/youlai-gateway/pom.xml index e9393b0dc..e8428b080 100644 --- a/youlai-gateway/pom.xml +++ b/youlai-gateway/pom.xml @@ -13,7 +13,9 @@ jar - 2.0.0 + 2.0.0 + 9999 + 32006 diff --git a/youlai-gateway/src/main/resources/bootstrap-k8s.yml b/youlai-gateway/src/main/resources/bootstrap-k8s.yml new file mode 100644 index 000000000..d4a571a5e --- /dev/null +++ b/youlai-gateway/src/main/resources/bootstrap-k8s.yml @@ -0,0 +1,20 @@ +server: + port: 9999 + +spring: + main: + allow-bean-definition-overriding: true + application: + name: youlai-gateway + cloud: + nacos: + discovery: + server-addr: nacos-headless.infrastructure:8848 # 使用k8s无头服务 + namespace: youlai-namespace-id + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + namespace: youlai-namespace-id + shared-configs[0]: + data-id: youlai-common.yaml + refresh: true From 7cf21fa7a86d9bdabb9eeb1121237c55c74a1045 Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Wed, 16 Mar 2022 15:23:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?ci:=20k8s=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-log/src/main/resources/logback-spring.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/youlai-common/common-log/src/main/resources/logback-spring.xml b/youlai-common/common-log/src/main/resources/logback-spring.xml index af992f90d..72ecdf34b 100644 --- a/youlai-common/common-log/src/main/resources/logback-spring.xml +++ b/youlai-common/common-log/src/main/resources/logback-spring.xml @@ -87,4 +87,12 @@ + + + + + + + + From 11ccd5403d089385cfe18b5187c3f4c7a2105f12 Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Wed, 16 Mar 2022 17:18:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?ci:=20=E8=BF=98=E5=8E=9F=E6=AD=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=20=20=20=20=20=20=20=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- youlai-gateway/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youlai-gateway/pom.xml b/youlai-gateway/pom.xml index e8428b080..f74bdce83 100644 --- a/youlai-gateway/pom.xml +++ b/youlai-gateway/pom.xml @@ -13,7 +13,7 @@ jar - 2.0.0 + 2.0.0 9999 32006 From f698b0853b0584f3a37769845868f8f1da154841 Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Wed, 16 Mar 2022 17:46:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?ci:=20=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- youlai-auth/src/main/resources/bootstrap-k8s.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/youlai-auth/src/main/resources/bootstrap-k8s.yml b/youlai-auth/src/main/resources/bootstrap-k8s.yml index 784e3f61e..08f96ef01 100644 --- a/youlai-auth/src/main/resources/bootstrap-k8s.yml +++ b/youlai-auth/src/main/resources/bootstrap-k8s.yml @@ -2,6 +2,8 @@ server: port: 8000 spring: + main: + allow-circular-references: true # 解决循环依赖的问题，似乎是因为版本太高了 mvc: pathmatch: matching-strategy: ant_path_matcher From febec72a3de95815e3259b334da9e1a83b7967a7 Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Wed, 16 Mar 2022 18:22:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?ci:=20=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- youlai-auth/src/main/resources/bootstrap-k8s.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/youlai-auth/src/main/resources/bootstrap-k8s.yml b/youlai-auth/src/main/resources/bootstrap-k8s.yml index 08f96ef01..784e3f61e 100644 --- a/youlai-auth/src/main/resources/bootstrap-k8s.yml +++ b/youlai-auth/src/main/resources/bootstrap-k8s.yml @@ -2,8 +2,6 @@ server: port: 8000 spring: - main: - allow-circular-references: true # 解决循环依赖的问题，似乎是因为版本太高了 mvc: pathmatch: matching-strategy: ant_path_matcher From 3c8a4b1a6cb41fbde31e9e5340f3540a9c4d7fb1 Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Wed, 16 Mar 2022 18:32:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?ci:=20=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- youlai-auth/src/main/resources/bootstrap-k8s.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youlai-auth/src/main/resources/bootstrap-k8s.yml b/youlai-auth/src/main/resources/bootstrap-k8s.yml index 784e3f61e..13d9c18e8 100644 --- a/youlai-auth/src/main/resources/bootstrap-k8s.yml +++ b/youlai-auth/src/main/resources/bootstrap-k8s.yml @@ -2,6 +2,9 @@ server: port: 8000 spring: + main: + allow-circular-references: true + allow-bean-definition-overriding: true mvc: pathmatch: matching-strategy: ant_path_matcher From 763b6ace689e4b2463affba0020910e88b00e7ea Mon Sep 17 00:00:00 2001 From: zhangjialin <1370559470@qq.com> Date: Sat, 19 Mar 2022 21:50:23 +0800 Subject: [PATCH 7/7] =?UTF-8?q?ci:=20=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devops/K8sJenkinsFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/K8sJenkinsFile b/devops/K8sJenkinsFile index f5e22e573..5185315ad 100644 --- a/devops/K8sJenkinsFile +++ b/devops/K8sJenkinsFile @@ -9,7 +9,7 @@ pipeline { // 直接上k8s，用k8s来管理docker choice( description: "你需要选择哪条分支进行构建?", name: "branch_name", - choices: ["feature/youlai_k8s_deploy3", "master", "feature/youlai_k8s_deploy"] + choices: ["master", "feature/youlai_k8s_deploy3"] ) choice( description: "你需要选择哪个微服务模块进行构建?",