diff --git a/.gitignore b/.gitignore index 723ef36..11236a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +迁移进度.md \ No newline at end of file diff --git a/devops/ccr.yaml b/devops/ccr.yaml new file mode 100644 index 0000000..1c95d6c --- /dev/null +++ b/devops/ccr.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +data: + .dockerconfigjson: eyJhdXRocyI6eyJjY3IuY2NzLnRlbmNlbnR5dW4uY29tIjp7InVzZXJuYW1lIjoiMTAwMDMwNjQ5MzI3IiwicGFzc3dvcmQiOiJEUm4yVmc2aVB1YmQiLCJlbWFpbCI6InF4c3VnYXJAZ21haWwuY29tIiwiYXV0aCI6Ik1UQXdNRE13TmpRNU16STNPa1JTYmpKV1p6WnBVSFZpWkE9PSJ9fX0= +kind: Secret +metadata: + creationTimestamp: "2024-05-14T05:42:37Z" + name: ccr + namespace: default + resourceVersion: "18724" + uid: 532c488a-7665-481b-ac68-2f2d3e25f23e +type: kubernetes.io/dockerconfigjson \ No newline at end of file diff --git a/devops/drone/docker-compose.yaml b/devops/drone/docker-compose.yaml index bdba26f..0d4e57c 100644 --- a/devops/drone/docker-compose.yaml +++ b/devops/drone/docker-compose.yaml @@ -2,9 +2,8 @@ version: "3" services: drone-server: container_name: drone-server - image: drone/drone:2 + image: dr.ppapi.cn/drone/drone:2 environment: - DRONE_LOGS_DEBUG: true DRONE_SERVER_HOST: drone2.lingpaike.com DRONE_SERVER_PROTO: https DRONE_RPC_SECRET: bf5f296c-3e53-40da-94ee-f171fbb33fac @@ -14,7 +13,7 @@ services: DRONE_GITEA_SERVER: https://gitea.lingpaike.com DRONE_USER_CREATE: username:root,admin:true DRONE_DATABASE_DRIVER: mysql - DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone2?parseTime=true + DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.30.0.15:3306)/drone2?parseTime=true ports: - "8182:80" restart: always @@ -23,7 +22,7 @@ services: drone-runner: container_name: drone-runner - image: drone/drone-runner-docker:1 + image: dr.ppapi.cn/drone/drone-runner-docker:1 restart: always environment: DRONE_RPC_HOST: drone-server @@ -33,6 +32,6 @@ services: DRONE_RUNNER_CAPACITY: 2 DRONE_RUNNER_NAME: default-agent DRONE_DATABASE_DRIVER: mysql - DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.17.0.6:3306)/drone2?parseTime=true + DRONE_DATABASE_DATASOURCE: root:rG8tAxtM9Js3@tcp(172.30.0.15:3306)/drone2?parseTime=true volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/devops/drone/ingress.yaml b/devops/drone/ingress.yaml index 91f0e76..6a80a2f 100644 --- a/devops/drone/ingress.yaml +++ b/devops/drone/ingress.yaml @@ -39,7 +39,7 @@ metadata: name: juno-drone subsets: - addresses: - - ip: 172.17.0.6 + - ip: 172.30.0.15 ports: - name: http port: 8182 diff --git a/devops/drone/ingress2.yaml b/devops/drone/ingress2.yaml new file mode 100644 index 0000000..a794aed --- /dev/null +++ b/devops/drone/ingress2.yaml @@ -0,0 +1,22 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: juno-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/elk/kube/filebeat/uat/filebeat-configmap.yaml b/devops/elk/kube/filebeat/uat/filebeat-configmap.yaml index 625df02..cae9241 100644 --- a/devops/elk/kube/filebeat/uat/filebeat-configmap.yaml +++ b/devops/elk/kube/filebeat/uat/filebeat-configmap.yaml @@ -132,6 +132,6 @@ data: output.logstash: hosts: - - "172.17.0.6:5044" + - "172.30.0.15:5044" username: juno password: tr0ngP4ssWD \ No newline at end of file diff --git a/devops/elk/kube/kibana/kibana-ingress.yaml b/devops/elk/kube/kibana/kibana-ingress.yaml index c0675fe..060c45d 100644 --- a/devops/elk/kube/kibana/kibana-ingress.yaml +++ b/devops/elk/kube/kibana/kibana-ingress.yaml @@ -41,7 +41,7 @@ metadata: name: juno-kibana subsets: - addresses: - - ip: 172.17.0.6 + - ip: 172.30.0.15 ports: - name: http port: 5601 diff --git a/devops/gitea/ingress.yaml b/devops/gitea/ingress.yaml index 274afd2..37d751c 100644 --- a/devops/gitea/ingress.yaml +++ b/devops/gitea/ingress.yaml @@ -39,7 +39,7 @@ metadata: name: juno-gitea subsets: - addresses: - - ip: 172.17.0.6 + - ip: 172.30.0.15 ports: - name: http port: 3000 diff --git a/devops/minio/docker-compose.yaml b/devops/minio/docker-compose.yaml index b5b2f32..626b39c 100644 --- a/devops/minio/docker-compose.yaml +++ b/devops/minio/docker-compose.yaml @@ -3,7 +3,7 @@ services: juno-minio: restart: always container_name: juno-minio - image: docker-registry-1.ppapi.cn/minio/minio:RELEASE.2024-07-26T20-48-21Z + image: dr.ppapi.cn/minio/minio:RELEASE.2024-07-26T20-48-21Z command: ["minio", "server", "--console-address", ":9001", "/data1"] ports: - "9000:9000" diff --git a/devops/minio/ingress.yaml b/devops/minio/ingress.yaml index 51f7023..43686ee 100644 --- a/devops/minio/ingress.yaml +++ b/devops/minio/ingress.yaml @@ -66,7 +66,7 @@ metadata: name: juno-minio subsets: - addresses: - - ip: 172.17.0.6 + - ip: 172.30.0.15 ports: - name: p9000 port: 9000 diff --git a/uat/database.yaml b/uat/database.yaml index 429c67c..10e9ad5 100644 --- a/uat/database.yaml +++ b/uat/database.yaml @@ -13,7 +13,7 @@ metadata: name: juno-postgres subsets: - addresses: - - ip: 172.17.0.6 + - ip: 172.30.0.15 ports: - port: 5432 @@ -33,6 +33,6 @@ metadata: name: juno-redis subsets: - addresses: - - ip: 172.17.0.6 + - ip: 172.30.0.15 ports: - port: 6379 \ No newline at end of file diff --git a/迁移进度.md b/迁移进度.md new file mode 100644 index 0000000..2bcf632 --- /dev/null +++ b/迁移进度.md @@ -0,0 +1,20 @@ +## 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 服务 +- [ ] drone +- [x] gitea +- [ ] elk +- [x] minio +- [x] mysql +- [x] pg +- [ ] redis(有问题) +- [ ] 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 \ No newline at end of file