From 21693a0bb965125468a6ccb25013056a17e9a6a4 Mon Sep 17 00:00:00 2001 From: qxsugar Date: Mon, 24 Feb 2025 17:14:25 +0800 Subject: [PATCH] updated: 2025-02-24 17:14:25 --- README.md | 97 +++++++++++++++++--------------- devops/docker/daemon.json | 1 + devops/drone/docker-compose.yaml | 3 +- devops/drone/ingress.yaml | 25 ++++++++ devops/drone/ingress2.yaml | 22 -------- devops/monitor-docker/main.go | 2 +- 迁移进度.md | 34 ----------- 7 files changed, 80 insertions(+), 104 deletions(-) delete mode 100644 devops/drone/ingress2.yaml delete mode 100644 迁移进度.md diff --git a/README.md b/README.md index 26d81b0..b9a4336 100644 --- a/README.md +++ b/README.md @@ -3,48 +3,58 @@ JUNO DEVOPS配置信息 ## 组件 -| 组件名称 | 访问url | 帐号 | 密码 | 备注 | -|:------------|:--------------------------|:------|:-------------|:--------------| -| jenkins | | admin | U!fM2g2* | 已废弃 | -| drone | drone.lingpaike.com | | | gitea授权登陆 | -| gitea | gitea.lingpaike.com | root | GB2yN264aEXZ | 仓库管理 | -| minio-admin | minio-admin.lingpaike.com | admin | hEWDoUr6iAwP | 存储管理 | - +| 组件名称 | 访问url | 帐号 | 密码 | 备注 | +|:------------|:----------------------------------|:------|:-------------|:----------| +| drone | https://drone.lingpaike.com | * | * | gitea授权登陆 | +| gitea | https://gitea.lingpaike.com | root | GB2yN264aEXZ | 仓库管理 | +| minio-admin | https://minio-admin.lingpaike.com | admin | hEWDoUr6iAwP | 存储管理 | ## 机器 -| ip | 用户名 | 密码 | 备注 | -|:----------------|:-------|:-----------------|:---------------------| -| 43.143.113.34 | root | qwer123#@!M | juno-base（⚠️废） | -| 106.54.25.21 | ubuntu | 7088588822a9d2E4 | juno-uat（⚠️废） | -| 124.221.245.182 | root | 7088588822a9d2E4 | 正式环境-数据 | -| 124.221.225.216 | ubuntu | 7088588822a9d2E4 | 正式环境-服务 | -| 114.117.250.235 | ubuntu | 7088588822a9d2E4 | 测试环境-服务 | -| 114.117.244.62 | ubuntu | 7088588822a9d2E4 | 测试环境-数据，基础组件 | +| ip | 用户名 | 密码 | 备注 | +|:----------------|:-------|:-----------------|:-------------| +| 124.221.245.182 | root | 7088588822a9d2E4 | 正式环境-数据 | +| 124.221.225.216 | ubuntu | 7088588822a9d2E4 | 正式环境-服务 | +| 114.117.250.235 | ubuntu | 7088588822a9d2E4 | 测试环境-服务 | +| 114.117.244.62 | ubuntu | 7088588822a9d2E4 | 测试环境-数据，基础组件 | ## 腾讯云帐号 -| 登陆地址 | 子帐户id | 用户名 | 密码 | 备注 | -|:-------------------------------------------|:-------------|:-------------|:----------------------------------|:----| -| https://cloud.tencent.com/login/subAccount | 100035811614 | huangjingkai | 7z8CH57%j8X9HTgptDkehuYJWnUiJz^pj | ⚠️废 | -| https://cloud.tencent.com/login/subAccount | 100030605182 | mingtao | qwer123#@!M | | +| 登陆地址 | 子帐户id | 用户名 | 密码 | 备注 | +|:--------------------------------|:-------------|:----|:---|:-------| +| https://cloud.tencent.com/login | 100030605182 | * | * | 微信扫码登录 | ## 腾讯云docker hub -| repo | namespace | user | pwd | 备注 | -|:-----------------------|:----------|:-------------|:-------------|:--------------------| +| repo | namespace | user | pwd | 备注 | +|:-----------------------|:----------|:-------------|:-------------|:-----------------| | ccr.ccs.tencentyun.com | juno | 100030649327 | DRn2Vg6iPubd | 所属帐号100030605182 | - ## drone 配置 -```yaml -appid: 197ba424-cf07-41be-9b66-f561e71f5293 -secret: gto_dtdbc5cjfd3dztzfa3qay3nqulp7ifppkzam52ghftv43o6leqia -callback: https://gitea.lingpaike.com/login -``` + +| app_id | secret | callback | +|--------------------------------------|----------------------------------------------------------|-----------------------------------| +| 197ba424-cf07-41be-9b66-f561e71f5293 | gto_dtdbc5cjfd3dztzfa3qay3nqulp7ifppkzam52ghftv43o6leqia | https://gitea.lingpaike.com/login | ### kibana 账号配置 -```text + +#### 账号密码原始信息 + +| 用户 | 密码 | +|----------------|--------------| +| sugar | meimima | +| liumingtao | TjvRST44Dbkf | +| huminghui | VeND2m24AGUv | +| dufeng | 24ouCHrmJSeJ | +| huangrongzhi | Xwmicej2zduS | +| zhouxiangguang | e4K42UQjjtDG | +| zhangzhe | RJZtEpdADo8w | + +#### 加密 + +```text +# htpasswd -nb $user $password 生成hash + sugar:$apr1$D/xE.jx6$ryMsW4q.rzrHXIXymhQM41 liumingtao:$apr1$mm.Ip3e4$XNiiVWak8a9IfdEcZZrLD. huminghui:$apr1$gHrCGuVZ$yJk4AMsHzyIyMvbastxSb0 @@ -53,30 +63,25 @@ huangrongzhi:$apr1$HEnEkVDJ$nuBWbzlre.7C7rkGQOGgm1 zhouxiangguang:$apr1$o5vsfIN4$4xQCR9zrxsnyRlbjHjl2p/ zhangzhe:$apr1$f.WACNwQ$Eg7yuapzsvziLU6iCclep0 -## 上面的文本base64后丢到k8s的secrets -## htpasswd -nb $user $password 生成密码 - -## 数据源 -sugar:meimima -liumingtao:TjvRST44Dbkf -huminghui:VeND2m24AGUv -dufeng:24ouCHrmJSeJ -huangrongzhi:Xwmicej2zduS -zhouxiangguang:e4K42UQjjtDG -zhangzhe:RJZtEpdADo8w +# 上面的文本base64后丢到k8s的secrets ``` -```yaml -### minio 配置 -admin-web: https://minio-admin.lingpaike.com -user: admin -password: hEWDoUr6iAwP +## 文件存储配置 +### 服务配置 + +| 后台访问地址 | 账号 | 密码 | +|-----------------------------------|-------|--------------| +| https://minio-admin.lingpaike.com | admin | hEWDoUr6iAwP | + +### API配置 + +```yaml ### 访问配置 endpoint: minio.lingpaike.com buckets: -- uat # 测试环境 -- product # 正式环境 + - uat # 测试环境 + - product # 正式环境 uat: key: WnNnehJLuSaPVRizxXCm diff --git a/devops/docker/daemon.json b/devops/docker/daemon.json index 62535b5..c5df0fa 100644 --- a/devops/docker/daemon.json +++ b/devops/docker/daemon.json @@ -1,6 +1,7 @@ { "metrics-addr" : "0.0.0.0:9323", "registry-mirrors": [ + "http://dr.ppapi.cn", "https://registry.docker-cn.com" ], "log-driver": "json-file", diff --git a/devops/drone/docker-compose.yaml b/devops/drone/docker-compose.yaml index 0d4e57c..2948d74 100644 --- a/devops/drone/docker-compose.yaml +++ b/devops/drone/docker-compose.yaml @@ -4,7 +4,8 @@ services: container_name: drone-server image: dr.ppapi.cn/drone/drone:2 environment: - DRONE_SERVER_HOST: drone2.lingpaike.com + DRONE_LOGS_DEBUG: true + DRONE_SERVER_HOST: drone.lingpaike.com DRONE_SERVER_PROTO: https DRONE_RPC_SECRET: bf5f296c-3e53-40da-94ee-f171fbb33fac DRONE_GITEA_CLIENT_ID: 197ba424-cf07-41be-9b66-f561e71f5293 diff --git a/devops/drone/ingress.yaml b/devops/drone/ingress.yaml index 6a80a2f..158e439 100644 --- a/devops/drone/ingress.yaml +++ b/devops/drone/ingress.yaml @@ -1,3 +1,28 @@ +# drone2.lingpaike.com +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: juno2-drone + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod +spec: + tls: + - hosts: + - drone2.lingpaike.com + secretName: drone2.lingpaike.com + rules: + - host: drone2.lingpaike.com + http: + paths: + - pathType: Prefix + path: "/" + backend: + service: + name: juno-drone + port: + number: 80 +--- +# drone.lingpaike.com apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/devops/drone/ingress2.yaml b/devops/drone/ingress2.yaml deleted file mode 100644 index 458c42f..0000000 --- a/devops/drone/ingress2.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: juno2-drone - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod -spec: - tls: - - hosts: - - drone2.lingpaike.com - secretName: drone2.lingpaike.com - rules: - - host: drone2.lingpaike.com - http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: juno-drone - port: - number: 80 diff --git a/devops/monitor-docker/main.go b/devops/monitor-docker/main.go index 6a5cd6d..d7e0928 100644 --- a/devops/monitor-docker/main.go +++ b/devops/monitor-docker/main.go @@ -17,7 +17,7 @@ var args string var tag string func sendFeedback(msg string) error { - url := fmt.Sprintf("https://api.day.app/tFaz24oYAmdzLbJhpnoZCG/%s?group=juno-monitor", msg) + url := fmt.Sprintf("https://api.day.app/a85GpPHGzVMvG8rB5q8FLP/%s?group=juno-monitor", msg) _, err := http.Get(url) return err } diff --git a/迁移进度.md b/迁移进度.md deleted file mode 100644 index 7974c58..0000000 --- a/迁移进度.md +++ /dev/null @@ -1,34 +0,0 @@ -## cronjob -* * * * * DOCKER_API_VERSION=1.39 /juno/monitor -args juno-minio,kibana,logstash,elasticsearch,drone-runner-2,drone-server-2,mysql,gitea,postgres,redis -tag juno-basic - -## docker 服务 -- [x] drone -- [x] gitea -- [x] elk -- [x] minio -- [x] mysql -- [x] pg -- [x] redis(有问题) -- [x] api服务 - -juno.dev.data -公网ip：114.117.244.62 -内网ip：172.30.0.15 - -juno.dev.svc -公网ip：114.117.250.235 -内网ip: 172.30.0.3 - -# 服务情人 -- [x] drone2.lingpaike.com -- [x] drone.lingpaike.com -- [x] admin.qa.lingpaike.com -- [x] gitea.lingpaike.com -- [x] minio-admin.lingpaike.com -- [x] minio.lingpaike.com - -- [ ] file.qa.lingpaike.com -- [ ] kibana.lingpaike.com -- [x] miniapp.qa.lingpaike.com -- [x] saas.qa.lingpaike.com -- [x] www.qa.lingpaike.com \ No newline at end of file