diff --git a/.github/workflows/docker-buildx.yml b/.github/workflows/docker-buildx.yml index 366317b1c5..3a8117bf25 100644 --- a/.github/workflows/docker-buildx.yml +++ b/.github/workflows/docker-buildx.yml @@ -54,6 +54,19 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Log in to AliYun Docker Hub + uses: docker/login-action@v3 + with: + registry: registry.cn-hangzhou.aliyuncs.com + username: ${{ secrets.ALIREGISTRY_USERNAME }} + password: ${{ secrets.ALIREGISTRY_TOKEN }} + ################################################ # build/ # └── docker @@ -89,7 +102,10 @@ jobs: id: meta1 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-api + images: | + ghcr.io/openimsdk/openim-api + docker.io/openimsdk/openim-api + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-api - name: Build and push Docker image for openim-api uses: docker/build-push-action@v5 @@ -107,7 +123,10 @@ jobs: id: meta2 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-cmdutils + images: | + ghcr.io/openimsdk/openim-cmdutils + docker.io/openimsdk/openim-cmdutils + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-cmdutils - name: Build and push Docker image for openim-cmdutils uses: docker/build-push-action@v5 @@ -125,7 +144,10 @@ jobs: id: meta3 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-crontask + images: | + ghcr.io/openimsdk/openim-crontask + docker.io/openimsdk/openim-crontask + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-crontask - name: Build and push Docker image for openim-crontask uses: docker/build-push-action@v5 @@ -143,7 +165,10 @@ jobs: id: meta4 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-msggateway + images: | + ghcr.io/openimsdk/openim-msggateway + docker.io/openimsdk/openim-msggateway + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-msggateway - name: Build and push Docker image for openim-msggateway uses: docker/build-push-action@v5 @@ -161,7 +186,10 @@ jobs: id: meta5 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-msgtransfer + images: | + ghcr.io/openimsdk/openim-msgtransfer + docker.io/openimsdk/openim-msgtransfer + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-msgtransfer - name: Build and push Docker image for openim-msgtransfer uses: docker/build-push-action@v5 @@ -179,7 +207,10 @@ jobs: id: meta6 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-push + images: | + ghcr.io/openimsdk/openim-push + docker.io/openimsdk/openim-push + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-push - name: Build and push Docker image for openim-push uses: docker/build-push-action@v5 @@ -197,7 +228,10 @@ jobs: id: meta7 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-auth + images: | + ghcr.io/openimsdk/openim-rpc-auth + docker.io/openimsdk/openim-rpc-auth + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-auth - name: Build and push Docker image for openim-rpc-auth uses: docker/build-push-action@v5 @@ -215,7 +249,10 @@ jobs: id: meta8 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-conversation + images: | + ghcr.io/openimsdk/openim-rpc-conversation + docker.io/openimsdk/openim-rpc-conversation + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-conversation - name: Build and push Docker image for openim-rpc-conversation uses: docker/build-push-action@v5 @@ -233,7 +270,10 @@ jobs: id: meta9 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-friend + images: | + ghcr.io/openimsdk/openim-rpc-friend + docker.io/openimsdk/openim-rpc-friend + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-friend - name: Build and push Docker image for openim-rpc-friend uses: docker/build-push-action@v5 @@ -251,7 +291,10 @@ jobs: id: meta10 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-group + images: | + ghcr.io/openimsdk/openim-rpc-group + docker.io/openimsdk/openim-rpc-group + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-group - name: Build and push Docker image for openim-rpc-group uses: docker/build-push-action@v5 @@ -269,7 +312,10 @@ jobs: id: meta11 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-msg + images: | + ghcr.io/openimsdk/openim-rpc-msg + docker.io/openimsdk/openim-rpc-msg + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-msg - name: Build and push Docker image for openim-rpc-msg uses: docker/build-push-action@v5 @@ -287,7 +333,10 @@ jobs: id: meta12 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-third + images: | + ghcr.io/openimsdk/openim-rpc-third + docker.io/openimsdk/openim-rpc-third + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-third - name: Build and push Docker image for openim-rpc-third uses: docker/build-push-action@v5 @@ -305,7 +354,10 @@ jobs: id: meta13 uses: docker/metadata-action@v5.0.0 with: - images: ghcr.io/openimsdk/openim-rpc-user + images: | + ghcr.io/openimsdk/openim-rpc-user + docker.io/openimsdk/openim-rpc-user + registry.cn-shanghai.aliyuncs.com/openimsdk/openim-rpc-user - name: Build and push Docker image for openim-rpc-user uses: docker/build-push-action@v5 @@ -318,4 +370,3 @@ jobs: labels: ${{ steps.meta13.outputs.labels }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache - diff --git a/README-zh_CN.md b/README-zh_CN.md index 8addfe20ac..f24ee47393 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -1,5 +1,5 @@

- +

@@ -23,7 +23,7 @@

English • 简体中文 • - Docs + Docs

diff --git a/README.md b/README.md index f58625fb0c..dd0a674d28 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- +

@@ -24,7 +24,7 @@

English • 简体中文 • - Docs + Docs

diff --git a/deployments/README.md b/deployments/README.md index 1e20a9759a..14781b4ec9 100644 --- a/deployments/README.md +++ b/deployments/README.md @@ -112,4 +112,3 @@ $ make image ## Installation Explore our Helm-Charts repository and read through: [Helm-Charts Repository](https://github.com/openimsdk/helm-charts) - diff --git a/deployments/Chart.yaml b/deployments/charts/Chart.yaml similarity index 100% rename from deployments/Chart.yaml rename to deployments/charts/Chart.yaml diff --git a/deployments/openim-server/openim-api/.helmignore b/deployments/charts/openim-api/.helmignore similarity index 100% rename from deployments/openim-server/openim-api/.helmignore rename to deployments/charts/openim-api/.helmignore diff --git a/deployments/openim-server/openim-api/Chart.yaml b/deployments/charts/openim-api/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-api/Chart.yaml rename to deployments/charts/openim-api/Chart.yaml diff --git a/deployments/openim-server/openim-api/LICENSE b/deployments/charts/openim-api/LICENSE similarity index 100% rename from deployments/openim-server/openim-api/LICENSE rename to deployments/charts/openim-api/LICENSE diff --git a/deployments/openim-server/openim-api/templates/NOTES.txt b/deployments/charts/openim-api/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-api/templates/NOTES.txt rename to deployments/charts/openim-api/templates/NOTES.txt diff --git a/deployments/openim-server/openim-api/templates/_helpers.tpl b/deployments/charts/openim-api/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-api/templates/_helpers.tpl rename to deployments/charts/openim-api/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-api/templates/app-cm.yaml b/deployments/charts/openim-api/templates/app-cm.yaml similarity index 100% rename from deployments/openim-server/openim-api/templates/app-cm.yaml rename to deployments/charts/openim-api/templates/app-cm.yaml diff --git a/deployments/openim-server/openim-api/templates/deployment.yaml b/deployments/charts/openim-api/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-api/templates/deployment.yaml rename to deployments/charts/openim-api/templates/deployment.yaml index c91d9512ed..ff0991a8ad 100644 --- a/deployments/openim-server/openim-api/templates/deployment.yaml +++ b/deployments/charts/openim-api/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-api/templates/hpa.yaml b/deployments/charts/openim-api/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-api/templates/hpa.yaml rename to deployments/charts/openim-api/templates/hpa.yaml diff --git a/deployments/openim-server/openim-api/templates/ingress.yaml b/deployments/charts/openim-api/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-api/templates/ingress.yaml rename to deployments/charts/openim-api/templates/ingress.yaml diff --git a/deployments/openim-server/openim-api/templates/service.yaml b/deployments/charts/openim-api/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-api/templates/service.yaml rename to deployments/charts/openim-api/templates/service.yaml diff --git a/deployments/openim-server/openim-api/templates/serviceaccount.yaml b/deployments/charts/openim-api/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-api/templates/serviceaccount.yaml rename to deployments/charts/openim-api/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-api/values.yaml b/deployments/charts/openim-api/values.yaml similarity index 100% rename from deployments/openim-server/openim-api/values.yaml rename to deployments/charts/openim-api/values.yaml diff --git a/deployments/openim-server/openim-msggateway/.helmignore b/deployments/charts/openim-msggateway/.helmignore similarity index 100% rename from deployments/openim-server/openim-msggateway/.helmignore rename to deployments/charts/openim-msggateway/.helmignore diff --git a/deployments/openim-server/openim-msggateway/Chart.yaml b/deployments/charts/openim-msggateway/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-msggateway/Chart.yaml rename to deployments/charts/openim-msggateway/Chart.yaml diff --git a/deployments/openim-server/openim-msggateway/templates/NOTES.txt b/deployments/charts/openim-msggateway/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-msggateway/templates/NOTES.txt rename to deployments/charts/openim-msggateway/templates/NOTES.txt diff --git a/deployments/openim-server/openim-msggateway/templates/_helpers.tpl b/deployments/charts/openim-msggateway/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-msggateway/templates/_helpers.tpl rename to deployments/charts/openim-msggateway/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-msggateway/templates/deployment.yaml b/deployments/charts/openim-msggateway/templates/deployment.yaml similarity index 94% rename from deployments/openim-server/openim-msggateway/templates/deployment.yaml rename to deployments/charts/openim-msggateway/templates/deployment.yaml index ca361e76bf..c1bcc12c94 100644 --- a/deployments/openim-server/openim-msggateway/templates/deployment.yaml +++ b/deployments/charts/openim-msggateway/templates/deployment.yaml @@ -51,10 +51,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-msggateway/templates/hpa.yaml b/deployments/charts/openim-msggateway/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-msggateway/templates/hpa.yaml rename to deployments/charts/openim-msggateway/templates/hpa.yaml diff --git a/deployments/openim-server/openim-msggateway/templates/ingress.yaml b/deployments/charts/openim-msggateway/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-msggateway/templates/ingress.yaml rename to deployments/charts/openim-msggateway/templates/ingress.yaml diff --git a/deployments/openim-server/openim-msggateway/templates/service.yaml b/deployments/charts/openim-msggateway/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-msggateway/templates/service.yaml rename to deployments/charts/openim-msggateway/templates/service.yaml diff --git a/deployments/openim-server/openim-msggateway/templates/serviceaccount.yaml b/deployments/charts/openim-msggateway/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-msggateway/templates/serviceaccount.yaml rename to deployments/charts/openim-msggateway/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-msggateway/values.yaml b/deployments/charts/openim-msggateway/values.yaml similarity index 100% rename from deployments/openim-server/openim-msggateway/values.yaml rename to deployments/charts/openim-msggateway/values.yaml diff --git a/deployments/openim-server/openim-msgtransfer/.helmignore b/deployments/charts/openim-msgtransfer/.helmignore similarity index 100% rename from deployments/openim-server/openim-msgtransfer/.helmignore rename to deployments/charts/openim-msgtransfer/.helmignore diff --git a/deployments/openim-server/openim-msgtransfer/Chart.yaml b/deployments/charts/openim-msgtransfer/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-msgtransfer/Chart.yaml rename to deployments/charts/openim-msgtransfer/Chart.yaml diff --git a/deployments/openim-server/openim-msgtransfer/templates/NOTES.txt b/deployments/charts/openim-msgtransfer/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-msgtransfer/templates/NOTES.txt rename to deployments/charts/openim-msgtransfer/templates/NOTES.txt diff --git a/deployments/openim-server/openim-msgtransfer/templates/_helpers.tpl b/deployments/charts/openim-msgtransfer/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-msgtransfer/templates/_helpers.tpl rename to deployments/charts/openim-msgtransfer/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-msgtransfer/templates/deployment.yaml b/deployments/charts/openim-msgtransfer/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-msgtransfer/templates/deployment.yaml rename to deployments/charts/openim-msgtransfer/templates/deployment.yaml index ba7bcabd00..6565bf15d6 100644 --- a/deployments/openim-server/openim-msgtransfer/templates/deployment.yaml +++ b/deployments/charts/openim-msgtransfer/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-msgtransfer/templates/hpa.yaml b/deployments/charts/openim-msgtransfer/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-msgtransfer/templates/hpa.yaml rename to deployments/charts/openim-msgtransfer/templates/hpa.yaml diff --git a/deployments/openim-server/openim-msgtransfer/templates/ingress.yaml b/deployments/charts/openim-msgtransfer/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-msgtransfer/templates/ingress.yaml rename to deployments/charts/openim-msgtransfer/templates/ingress.yaml diff --git a/deployments/openim-server/openim-msgtransfer/templates/service.yaml b/deployments/charts/openim-msgtransfer/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-msgtransfer/templates/service.yaml rename to deployments/charts/openim-msgtransfer/templates/service.yaml diff --git a/deployments/openim-server/openim-msgtransfer/templates/serviceaccount.yaml b/deployments/charts/openim-msgtransfer/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-msgtransfer/templates/serviceaccount.yaml rename to deployments/charts/openim-msgtransfer/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-msgtransfer/values.yaml b/deployments/charts/openim-msgtransfer/values.yaml similarity index 100% rename from deployments/openim-server/openim-msgtransfer/values.yaml rename to deployments/charts/openim-msgtransfer/values.yaml diff --git a/deployments/openim-server/openim-push/.helmignore b/deployments/charts/openim-push/.helmignore similarity index 100% rename from deployments/openim-server/openim-push/.helmignore rename to deployments/charts/openim-push/.helmignore diff --git a/deployments/openim-server/openim-push/Chart.yaml b/deployments/charts/openim-push/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-push/Chart.yaml rename to deployments/charts/openim-push/Chart.yaml diff --git a/deployments/openim-server/openim-push/templates/NOTES.txt b/deployments/charts/openim-push/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-push/templates/NOTES.txt rename to deployments/charts/openim-push/templates/NOTES.txt diff --git a/deployments/openim-server/openim-push/templates/_helpers.tpl b/deployments/charts/openim-push/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-push/templates/_helpers.tpl rename to deployments/charts/openim-push/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-push/templates/deployment.yaml b/deployments/charts/openim-push/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-push/templates/deployment.yaml rename to deployments/charts/openim-push/templates/deployment.yaml index 9a94a03c65..d408c0dcbf 100644 --- a/deployments/openim-server/openim-push/templates/deployment.yaml +++ b/deployments/charts/openim-push/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-push/templates/hpa.yaml b/deployments/charts/openim-push/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-push/templates/hpa.yaml rename to deployments/charts/openim-push/templates/hpa.yaml diff --git a/deployments/openim-server/openim-push/templates/ingress.yaml b/deployments/charts/openim-push/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-push/templates/ingress.yaml rename to deployments/charts/openim-push/templates/ingress.yaml diff --git a/deployments/openim-server/openim-push/templates/service.yaml b/deployments/charts/openim-push/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-push/templates/service.yaml rename to deployments/charts/openim-push/templates/service.yaml diff --git a/deployments/openim-server/openim-push/templates/serviceaccount.yaml b/deployments/charts/openim-push/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-push/templates/serviceaccount.yaml rename to deployments/charts/openim-push/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-push/values.yaml b/deployments/charts/openim-push/values.yaml similarity index 100% rename from deployments/openim-server/openim-push/values.yaml rename to deployments/charts/openim-push/values.yaml diff --git a/deployments/openim-server/openim-rpc-auth/.helmignore b/deployments/charts/openim-rpc-auth/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-auth/.helmignore rename to deployments/charts/openim-rpc-auth/.helmignore diff --git a/deployments/openim-server/openim-rpc-auth/Chart.yaml b/deployments/charts/openim-rpc-auth/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-auth/Chart.yaml rename to deployments/charts/openim-rpc-auth/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-auth/templates/NOTES.txt b/deployments/charts/openim-rpc-auth/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-auth/templates/NOTES.txt rename to deployments/charts/openim-rpc-auth/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-auth/templates/_helpers.tpl b/deployments/charts/openim-rpc-auth/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-auth/templates/_helpers.tpl rename to deployments/charts/openim-rpc-auth/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-auth/templates/deployment.yaml b/deployments/charts/openim-rpc-auth/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-rpc-auth/templates/deployment.yaml rename to deployments/charts/openim-rpc-auth/templates/deployment.yaml index 9cfb750c25..391e38b8f7 100644 --- a/deployments/openim-server/openim-rpc-auth/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-auth/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-auth/templates/hpa.yaml b/deployments/charts/openim-rpc-auth/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-auth/templates/hpa.yaml rename to deployments/charts/openim-rpc-auth/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-auth/templates/ingress.yaml b/deployments/charts/openim-rpc-auth/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-auth/templates/ingress.yaml rename to deployments/charts/openim-rpc-auth/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-auth/templates/service.yaml b/deployments/charts/openim-rpc-auth/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-auth/templates/service.yaml rename to deployments/charts/openim-rpc-auth/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-auth/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-auth/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-auth/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-auth/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-auth/values.yaml b/deployments/charts/openim-rpc-auth/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-auth/values.yaml rename to deployments/charts/openim-rpc-auth/values.yaml diff --git a/deployments/openim-server/openim-rpc-conversation/.helmignore b/deployments/charts/openim-rpc-conversation/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/.helmignore rename to deployments/charts/openim-rpc-conversation/.helmignore diff --git a/deployments/openim-server/openim-rpc-conversation/Chart.yaml b/deployments/charts/openim-rpc-conversation/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/Chart.yaml rename to deployments/charts/openim-rpc-conversation/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-conversation/templates/NOTES.txt b/deployments/charts/openim-rpc-conversation/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/templates/NOTES.txt rename to deployments/charts/openim-rpc-conversation/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-conversation/templates/_helpers.tpl b/deployments/charts/openim-rpc-conversation/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/templates/_helpers.tpl rename to deployments/charts/openim-rpc-conversation/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-conversation/templates/deployment.yaml b/deployments/charts/openim-rpc-conversation/templates/deployment.yaml similarity index 94% rename from deployments/openim-server/openim-rpc-conversation/templates/deployment.yaml rename to deployments/charts/openim-rpc-conversation/templates/deployment.yaml index e0f71a0a80..54e14dd8e4 100644 --- a/deployments/openim-server/openim-rpc-conversation/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-conversation/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-conversation/templates/hpa.yaml b/deployments/charts/openim-rpc-conversation/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/templates/hpa.yaml rename to deployments/charts/openim-rpc-conversation/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-conversation/templates/ingress.yaml b/deployments/charts/openim-rpc-conversation/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/templates/ingress.yaml rename to deployments/charts/openim-rpc-conversation/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-conversation/templates/service.yaml b/deployments/charts/openim-rpc-conversation/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/templates/service.yaml rename to deployments/charts/openim-rpc-conversation/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-conversation/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-conversation/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-conversation/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-conversation/values.yaml b/deployments/charts/openim-rpc-conversation/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-conversation/values.yaml rename to deployments/charts/openim-rpc-conversation/values.yaml diff --git a/deployments/openim-server/openim-rpc-friend/.helmignore b/deployments/charts/openim-rpc-friend/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-friend/.helmignore rename to deployments/charts/openim-rpc-friend/.helmignore diff --git a/deployments/openim-server/openim-rpc-friend/Chart.yaml b/deployments/charts/openim-rpc-friend/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-friend/Chart.yaml rename to deployments/charts/openim-rpc-friend/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-friend/templates/NOTES.txt b/deployments/charts/openim-rpc-friend/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-friend/templates/NOTES.txt rename to deployments/charts/openim-rpc-friend/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-friend/templates/_helpers.tpl b/deployments/charts/openim-rpc-friend/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-friend/templates/_helpers.tpl rename to deployments/charts/openim-rpc-friend/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-friend/templates/deployment.yaml b/deployments/charts/openim-rpc-friend/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-rpc-friend/templates/deployment.yaml rename to deployments/charts/openim-rpc-friend/templates/deployment.yaml index 0f677aa9fa..d52ee02dfc 100644 --- a/deployments/openim-server/openim-rpc-friend/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-friend/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-friend/templates/hpa.yaml b/deployments/charts/openim-rpc-friend/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-friend/templates/hpa.yaml rename to deployments/charts/openim-rpc-friend/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-friend/templates/ingress.yaml b/deployments/charts/openim-rpc-friend/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-friend/templates/ingress.yaml rename to deployments/charts/openim-rpc-friend/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-friend/templates/service.yaml b/deployments/charts/openim-rpc-friend/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-friend/templates/service.yaml rename to deployments/charts/openim-rpc-friend/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-friend/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-friend/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-friend/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-friend/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-friend/values.yaml b/deployments/charts/openim-rpc-friend/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-friend/values.yaml rename to deployments/charts/openim-rpc-friend/values.yaml diff --git a/deployments/openim-server/openim-rpc-group/.helmignore b/deployments/charts/openim-rpc-group/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-group/.helmignore rename to deployments/charts/openim-rpc-group/.helmignore diff --git a/deployments/openim-server/openim-rpc-group/Chart.yaml b/deployments/charts/openim-rpc-group/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-group/Chart.yaml rename to deployments/charts/openim-rpc-group/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-group/templates/NOTES.txt b/deployments/charts/openim-rpc-group/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-group/templates/NOTES.txt rename to deployments/charts/openim-rpc-group/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-group/templates/_helpers.tpl b/deployments/charts/openim-rpc-group/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-group/templates/_helpers.tpl rename to deployments/charts/openim-rpc-group/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-group/templates/deployment.yaml b/deployments/charts/openim-rpc-group/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-rpc-group/templates/deployment.yaml rename to deployments/charts/openim-rpc-group/templates/deployment.yaml index 2883b17ee4..7f0fdaed09 100644 --- a/deployments/openim-server/openim-rpc-group/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-group/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-group/templates/hpa.yaml b/deployments/charts/openim-rpc-group/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-group/templates/hpa.yaml rename to deployments/charts/openim-rpc-group/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-group/templates/ingress.yaml b/deployments/charts/openim-rpc-group/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-group/templates/ingress.yaml rename to deployments/charts/openim-rpc-group/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-group/templates/service.yaml b/deployments/charts/openim-rpc-group/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-group/templates/service.yaml rename to deployments/charts/openim-rpc-group/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-group/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-group/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-group/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-group/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-group/values.yaml b/deployments/charts/openim-rpc-group/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-group/values.yaml rename to deployments/charts/openim-rpc-group/values.yaml diff --git a/deployments/openim-server/openim-rpc-msg/.helmignore b/deployments/charts/openim-rpc-msg/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-msg/.helmignore rename to deployments/charts/openim-rpc-msg/.helmignore diff --git a/deployments/openim-server/openim-rpc-msg/Chart.yaml b/deployments/charts/openim-rpc-msg/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-msg/Chart.yaml rename to deployments/charts/openim-rpc-msg/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-msg/templates/NOTES.txt b/deployments/charts/openim-rpc-msg/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-msg/templates/NOTES.txt rename to deployments/charts/openim-rpc-msg/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-msg/templates/_helpers.tpl b/deployments/charts/openim-rpc-msg/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-msg/templates/_helpers.tpl rename to deployments/charts/openim-rpc-msg/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-msg/templates/deployment.yaml b/deployments/charts/openim-rpc-msg/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-rpc-msg/templates/deployment.yaml rename to deployments/charts/openim-rpc-msg/templates/deployment.yaml index 8fed86a0b7..d647d2843e 100644 --- a/deployments/openim-server/openim-rpc-msg/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-msg/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-msg/templates/hpa.yaml b/deployments/charts/openim-rpc-msg/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-msg/templates/hpa.yaml rename to deployments/charts/openim-rpc-msg/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-msg/templates/ingress.yaml b/deployments/charts/openim-rpc-msg/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-msg/templates/ingress.yaml rename to deployments/charts/openim-rpc-msg/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-msg/templates/service.yaml b/deployments/charts/openim-rpc-msg/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-msg/templates/service.yaml rename to deployments/charts/openim-rpc-msg/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-msg/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-msg/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-msg/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-msg/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-msg/values.yaml b/deployments/charts/openim-rpc-msg/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-msg/values.yaml rename to deployments/charts/openim-rpc-msg/values.yaml diff --git a/deployments/openim-server/openim-rpc-third/.helmignore b/deployments/charts/openim-rpc-third/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-third/.helmignore rename to deployments/charts/openim-rpc-third/.helmignore diff --git a/deployments/openim-server/openim-rpc-third/Chart.yaml b/deployments/charts/openim-rpc-third/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-third/Chart.yaml rename to deployments/charts/openim-rpc-third/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-third/templates/NOTES.txt b/deployments/charts/openim-rpc-third/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-third/templates/NOTES.txt rename to deployments/charts/openim-rpc-third/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-third/templates/_helpers.tpl b/deployments/charts/openim-rpc-third/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-third/templates/_helpers.tpl rename to deployments/charts/openim-rpc-third/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-third/templates/deployment.yaml b/deployments/charts/openim-rpc-third/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-rpc-third/templates/deployment.yaml rename to deployments/charts/openim-rpc-third/templates/deployment.yaml index dae7dc9537..6537c3e7f9 100644 --- a/deployments/openim-server/openim-rpc-third/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-third/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-third/templates/hpa.yaml b/deployments/charts/openim-rpc-third/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-third/templates/hpa.yaml rename to deployments/charts/openim-rpc-third/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-third/templates/ingress.yaml b/deployments/charts/openim-rpc-third/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-third/templates/ingress.yaml rename to deployments/charts/openim-rpc-third/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-third/templates/service.yaml b/deployments/charts/openim-rpc-third/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-third/templates/service.yaml rename to deployments/charts/openim-rpc-third/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-third/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-third/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-third/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-third/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-third/values.yaml b/deployments/charts/openim-rpc-third/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-third/values.yaml rename to deployments/charts/openim-rpc-third/values.yaml diff --git a/deployments/openim-server/openim-rpc-user/.helmignore b/deployments/charts/openim-rpc-user/.helmignore similarity index 100% rename from deployments/openim-server/openim-rpc-user/.helmignore rename to deployments/charts/openim-rpc-user/.helmignore diff --git a/deployments/openim-server/openim-rpc-user/Chart.yaml b/deployments/charts/openim-rpc-user/Chart.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-user/Chart.yaml rename to deployments/charts/openim-rpc-user/Chart.yaml diff --git a/deployments/openim-server/openim-rpc-user/templates/NOTES.txt b/deployments/charts/openim-rpc-user/templates/NOTES.txt similarity index 100% rename from deployments/openim-server/openim-rpc-user/templates/NOTES.txt rename to deployments/charts/openim-rpc-user/templates/NOTES.txt diff --git a/deployments/openim-server/openim-rpc-user/templates/_helpers.tpl b/deployments/charts/openim-rpc-user/templates/_helpers.tpl similarity index 100% rename from deployments/openim-server/openim-rpc-user/templates/_helpers.tpl rename to deployments/charts/openim-rpc-user/templates/_helpers.tpl diff --git a/deployments/openim-server/openim-rpc-user/templates/deployment.yaml b/deployments/charts/openim-rpc-user/templates/deployment.yaml similarity index 93% rename from deployments/openim-server/openim-rpc-user/templates/deployment.yaml rename to deployments/charts/openim-rpc-user/templates/deployment.yaml index ec3bcd1c08..d01c1ce8fa 100644 --- a/deployments/openim-server/openim-rpc-user/templates/deployment.yaml +++ b/deployments/charts/openim-rpc-user/templates/deployment.yaml @@ -48,10 +48,10 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath: /app/config/config.yaml + - mountPath: /oepnim/openim-server/config/config.yaml name: config subPath: config.yaml - - mountPath: /app/config/notification.yaml + - mountPath: /oepnim/openim-server/config/notification.yaml name: config subPath: notification.yaml volumes: diff --git a/deployments/openim-server/openim-rpc-user/templates/hpa.yaml b/deployments/charts/openim-rpc-user/templates/hpa.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-user/templates/hpa.yaml rename to deployments/charts/openim-rpc-user/templates/hpa.yaml diff --git a/deployments/openim-server/openim-rpc-user/templates/ingress.yaml b/deployments/charts/openim-rpc-user/templates/ingress.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-user/templates/ingress.yaml rename to deployments/charts/openim-rpc-user/templates/ingress.yaml diff --git a/deployments/openim-server/openim-rpc-user/templates/service.yaml b/deployments/charts/openim-rpc-user/templates/service.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-user/templates/service.yaml rename to deployments/charts/openim-rpc-user/templates/service.yaml diff --git a/deployments/openim-server/openim-rpc-user/templates/serviceaccount.yaml b/deployments/charts/openim-rpc-user/templates/serviceaccount.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-user/templates/serviceaccount.yaml rename to deployments/charts/openim-rpc-user/templates/serviceaccount.yaml diff --git a/deployments/openim-server/openim-rpc-user/values.yaml b/deployments/charts/openim-rpc-user/values.yaml similarity index 100% rename from deployments/openim-server/openim-rpc-user/values.yaml rename to deployments/charts/openim-rpc-user/values.yaml diff --git a/deployments/templates/helm-image.yaml b/deployments/templates/helm-image.yaml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/template/head.md.tmpl b/scripts/template/head.md.tmpl index 4aba975561..41dac30ef2 100644 --- a/scripts/template/head.md.tmpl +++ b/scripts/template/head.md.tmpl @@ -16,7 +16,7 @@ Learn more about versions of OpenIM: - + diff --git a/tools/versionchecker/versionchecker.go b/tools/versionchecker/versionchecker.go index b8b04c723c..57917cb942 100644 --- a/tools/versionchecker/versionchecker.go +++ b/tools/versionchecker/versionchecker.go @@ -100,7 +100,7 @@ func getOpenIMClientVersion() (string, error) { } func main() { - red := color.New(color.FgRed).SprintFunc() + // red := color.New(color.FgRed).SprintFunc() green := color.New(color.FgGreen).SprintFunc() blue := color.New(color.FgBlue).SprintFunc() yellow := color.New(color.FgYellow).SprintFunc()