Merge pull request #2218 from zgfh/monkeys

update monkeys to 0.1.11
DaoCloud · Jun 27, 2024 · 5f4b76e · 5f4b76e
2 parents b756f2b + 66f6309
commit 5f4b76e
Show file tree

Hide file tree

Showing 10 changed files with 345 additions and 841 deletions.
diff --git a/charts/monkeys-core/config b/charts/monkeys-core/config
@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=false
 export REPO_URL=https://inf-monkeys.github.io/helm-charts
 export REPO_NAME=inf-monkeys
 export CHART_NAME=core
-export VERSION=v0.1.9
+export VERSION=v0.1.11
 
 # pr issue
 export UPGRADE_METHOD=pr

diff --git a/charts/monkeys-core/custom.sh b/charts/monkeys-core/custom.sh
@@ -23,8 +23,10 @@ yq -i '
   .core.images.conductor.registry = "m.daocloud.io/docker.io" |
   .core.images.oneapi.registry = "m.daocloud.io/docker.io" |
   .core.images.busybox.registry = "m.daocloud.io/docker.io" |
+  .core.images.busybox.tag = "1.36.0" |
   .core.images.clash.registry = "m.daocloud.io/docker.io" |
   .core.images.nginx.registry = "m.daocloud.io/docker.io" |
+  .core.images.nginx.tag = "1.25.2-alpine" |
   .core.oneapi.enabled=false |
   .core.proxy.resources={"limits":{"cpu":"1000m","memory":"2048M"},"requests":{"cpu":"100m","memory":"125M"}} |
   .core.server.resources={"limits":{"cpu":"1000m","memory":"2048M"},"requests":{"cpu":"100m","memory":"125M"}} |
@@ -40,16 +42,21 @@ yq -i '
   .core.externalConductorPostgresql.host="pg-svc.infra-drun.svc" |
   .core.externalConductorPostgresql.port=5432 |
   .core.externalConductorPostgresql.username="postgres" |
+  .core.redis.enabled=false |
+  .core.externalRedis.enabled=true |
+  .core.externalRedis.enabled=true |
+  .core.externalRedis.url="redis://:[email protected]:6379/0" |
   .core.oneapi.enabled=false |
   .core.elasticsearch.enabled=false |
   .core.externalElasticsearch.enabled=true |
-  .core.externalElasticsearch.url="http://mcamel-common-es-cluster-masters-es-http.mcamel-system.svc:9200" |
+  .core.externalElasticsearch.url="http://es-es-http.infra-drun.svc:9200" |
   .core.externalElasticsearch.username="elastic" |
   .core.minio.enabled=false |
   .core.externalS3.enabled=true |
-  .core.externalS3.endpoint="https://minio-svc.infra-drun.svc" |
+  .core.externalS3.endpoint="http://minio-svc.infra-drun.svc" |
   .core.externalS3.accessKeyId="minio" |
   .core.externalS3.region="us-east-1" |
+  .core.service.type="NodePort" |
   .core.externalS3.bucket="monkeys" 
   
 
@@ -79,4 +86,6 @@ sed -i '/clash/d' .relok8s-images.yaml
 rm -rf charts/core/.relok8s-images.yaml
 rm -rf charts/core/charts/*
 rm -rf charts/core/templates/tests/*
+
+
 exit 0
diff --git a/charts/monkeys-core/monkeys-core/Chart.yaml b/charts/monkeys-core/monkeys-core/Chart.yaml
@@ -2,12 +2,12 @@ apiVersion: v2
 appVersion: 1.16.0
 dependencies:
   - name: core
-    version: v0.1.9
+    version: v0.1.11
     repository: https://inf-monkeys.github.io/helm-charts
 description: A Helm chart for Monkeys core service.
 name: monkeys-core
 type: application
-version: 0.1.9
+version: 0.1.11
 maintainers:
   - name: inf-monkeys
     url: https://github.com/inf-monkeys/helm-charts

diff --git a/charts/monkeys-core/monkeys-core/charts/core/Chart.yaml b/charts/monkeys-core/monkeys-core/charts/core/Chart.yaml
@@ -28,4 +28,4 @@ dependencies:
 description: A Helm chart for Monkeys core service.
 name: core
 type: application
-version: 0.1.9
+version: 0.1.11
diff --git a/charts/monkeys-core/monkeys-core/charts/core/README_zh.md b/charts/monkeys-core/monkeys-core/charts/core/README_zh.md
@@ -586,7 +586,7 @@ sentinels:
 | -------------------------------------- | ------------------------------------------------------- | --------------------------------------------------------- |
 | `GProductNavigator.enabled`            | 是否启用 Daocloud DCE 菜单                              | `false`                                                   |
 | `GProductNavigator.spec.name`          | 显示名称                                                | `流程编排`                                                |
-| `GProductNavigator.spec.iconUrl`       | Logo                                                    | `[false](https://static.infmonkeys.com/favicon-gray.svg)` |
+| `GProductNavigator.spec.iconUrl`       | Logo                                                    | `https://static.infmonkeys.com/favicon-gray.svg` |
 | `GProductNavigator.spec.localizedName` | 多语言名称配置                                          | `""`                                                      |
 | `GProductNavigator.spec.url`           | 点击菜单之后的跳转地址，请修改为 Monkeys 的方访问地址。 | `"https://ai.daocloud.cn/login"`                          |
 | `GProductNavigator.spec.category`      | 类型                                                    | `modelapplication`                                        |

diff --git a/charts/monkeys-core/monkeys-core/charts/core/templates/GProductNavigator.yaml b/charts/monkeys-core/monkeys-core/charts/core/templates/GProductNavigator.yaml
@@ -3,7 +3,7 @@ apiVersion: ghippo.io/v1alpha1
 kind: GProductNavigator
 metadata:
   name: monkeys # 命名规则：由小写的"spec.gproduct"与"-custom"而成
-data:
+spec:
   name: {{ .Values.GProductNavigator.spec.name }}
   iconUrl: {{ .Values.GProductNavigator.spec.iconUrl }}
   localizedName: # 定义菜单的中英文名称

diff --git a/charts/monkeys-core/monkeys-core/charts/core/values.yaml b/charts/monkeys-core/monkeys-core/charts/core/values.yaml
@@ -9,14 +9,14 @@ images:
     repository: infmonkeys/monkeys
     # To use multi tenancy version
     # repository: infmonkeys/monkeys-multi-tenancy
-    tag: latest
+    tag: 0.1.3
     pullPolicy: IfNotPresent
     pullSecrets: 
 
   web:
     registry: docker.io
     repository: infmonkeys/monkeys-ui
-    tag: latest
+    tag: 0.1.3
     pullPolicy: IfNotPresent
     pullSecrets: 
 
@@ -25,7 +25,7 @@ images:
     repository: infmonkeys/monkeys-admin
     # To use multi tenancy version
     # repository: infmonkeys/monkeys-admin-multi-tenancy
-    tag: latest
+    tag: 0.0.5
     pullPolicy: IfNotPresent
     pullSecrets: