提交v2.6版本chart

.beagle.yml

@@ -3,7 +3,7 @@ name: docker
 
 trigger:
   branch:
-    - master
+    - v2.6-apaasv5
 
 clone:
   disable: true
@@ -26,7 +26,11 @@ steps:
         from_secret: SECRET_KEY_MINIO
     commands:
       - mc alias set cache --api=S3v4 https://cache.wodcloud.com $S3_ACCESS_KEY $S3_SECRET_KEY
-      - mc cp ./approval-process-2.5.1-apaasv5.tgz cache/kubernetes/market/approval-process-2.5.1-apaasv5.tgz
+      - mc cp ./approval-process-v2.6-apaasv5.tgz cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/approval-process-v2.6-apaasv5.tgz
+      - mc cp ./values.yaml cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/approval-process-v2.6-apaasv5.yaml
+      - mc cp ./README.md cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/approval-process-v2.6-apaasv5.md 
+      - mc cp -r ./sql文件 cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/
+
 
 ---
 kind: secret

Chart.yaml

-apiVersion: v2
-name: approval-process
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.5.1-apaasv5
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
-
+apiVersion: v1
+name: beagle-approval-process
+description: Beagle DataComputing Platform
+version: v2.6-apaasv5
 keywords:
   - beagle
   - data

README.md

 ### 概要说明
 
 ``` 
-流程设计V2.4
+业务工作流v2.6-apaasv5
 ```
 ### 注意
 ```
@@ -9,15 +9,36 @@
   2、服务配置的redis连接地址，需要和apaas中配置的地址保持一致；
   3、values.yaml中的global参数均有注释，请根据注释配置正确。
 ```
+### 镜像列表
+```
+--- amd版本
+hub.wodcloud.com/approval-process/approval-process-engine:2.6-apass5-amd64
+ hub.wodcloud.com/approval-process/approval-process-form:2.6-apass5-amd64
+hub.wodcloud.com/workflow/approval-ui:2.6-alpha
+hub.wodcloud.com/workflow/approval-form:2.6.0-form-alpha
+zeebe amd镜像
+registry.cn-qingdao.aliyuncs.com/wod/zeebe:1.1.2-exporter-amd64
+importer amd镜像
+hub.wodcloud.com/workflow/process-importer:v1.5-alpha-amd64
+
+--- arm版本
+hub.wodcloud.com/approval-process/approval-process-engine:2.6-apass5-arm64
+hub.wodcloud.com/approval-process/approval-process-form:2.6-apass5-arm64
+hub.wodcloud.com/workflow/approval-ui:2.6-alpha-arm64
+hub.wodcloud.com/workflow/approval-form:2.6.0-form-alpha-arm64
+zeebe arm镜像
+registry.cn-qingdao.aliyuncs.com/wod/zeebe:1.1.2-exporter-arm64
+importer arm镜像
+hub.wodcloud.com/workflow/process-importer:v1.5-alpha-arm64
+```
+
 ### DB说明
 ```
-https://cloud.wodcloud.com/git/approval-process/approval-process-yaml/-/blob/master/deploy/product/v2.5.0-apaasv5/README.MD
+https://cloud.wodcloud.com/git/approval-process/approval-process-yaml/-/blob/master/deploy/product/v2.6-apaasv5/README.MD
 
-需要新建业务工作流数据库 执行product/v2.5.0/approval-process_init.sql
-需要新建表单数据库 执行product/v2.5.0/approval-process-form_init.sql
+工作流数据库 执行 sql/approval-process_init.sql      另执行apaas初始化流程录入 对应 sql/approval.sql
+表单数据库 执行 sql/approval-process-form_init.sql   另执行apaas初始化字典录入 对应 sql/approval_form.sql
 
-工作流数据库 执行product/v2.5.0-apaasv5/approval-process_init.sql
-表单数据库 执行product/v2.5.0-apaasv5/approval-process-form_init.sql
 ```
 
 ### 其他说明
@@ -25,14 +46,11 @@ https://cloud.wodcloud.com/git/approval-process/approval-process-yaml/-/blob/mas
 部署方式详参deploy.md文件
 
 依赖组件 
-apaas-v3 & apaas-v5
+apaas-v5
 postgres
 redis(apass所连接的redis)
 zeebe(新)
 zeebe-impoter(新)
 
-zeebe arm镜像
-registry.cn-qingdao.aliyuncs.com/wod/zeebe:1.1.2-exporter-arm64
-importer arm镜像
-hub.wodcloud.com/workflow/process-importer:v1.5-alpha-arm64
+zeebe-impoter 需要连接的是服务编排的数据库，并配置zeebe内部断点
 ```

deploy.md

@@ -10,7 +10,7 @@
   helm install \
   approval-process \
   /etc/kubernetes/charts/approval-process \
-  --namespace apaas-v5-approval \
+  --namespace approval-process \
   -f /etc/kubernetes/charts/approval-process/values.yaml
 ```
 
@@ -19,7 +19,7 @@
   helm upgrade \
   approval-process \
   /etc/kubernetes/charts/approval-process \
-  --namespace apaas-v5-approval \
+  --namespace approval-process \
   -f /etc/kubernetes/charts/approval-process/values.yaml
 ```
 
@@ -27,9 +27,9 @@
 ```
   helm uninstall \
   approval-process \
-  --namespace apaas-v5-approval
+  --namespace approval-process
   
-  kubectl delete ns apaas-v5-approval
+  kubectl delete ns approval-process
 ```
 
 ## Template
@@ -37,13 +37,13 @@
   helm template \
   approval-process \
   /etc/kubernetes/charts/approval-process \
-  --namespace apaas-v5-approval \
+  --namespace approval-process \
   -f /etc/kubernetes/charts/approval-process/values.yaml >  /etc/kubernetes/charts/approval-process-dist.yaml
 ```
 
 
 ```
-kubectl create ns apaas-v5-approval
+kubectl create ns approval-process
 
 # 1. Package
 helm package .
@@ -51,27 +51,27 @@ helm package .
 # 2. Install
 helm install \
 approval-process \
-/etc/kubernetes/charts/approval-process-2.5.1.tgz \
---namespace apaas-v5-approval \
--f /etc/kubernetes/charts/approval-process-2.5.1.yaml
+/etc/kubernetes/charts/approval-process-v2.6-apaasv5.tgz \
+--namespace approval-process \
+-f /etc/kubernetes/charts/approval-process-v2.6-apaasv5.yaml
 
 # 3. Upgrade
 helm upgrade \
 approval-process \
-/etc/kubernetes/charts/approval-process-2.5.1.tgz \
---namespace apaas-v5-approval \
--f /etc/kubernetes/charts/approval-process-2.5.1.yaml
+/etc/kubernetes/charts/approval-process-v2.6-apaasv5.tgz \
+--namespace approval-process \
+-f /etc/kubernetes/charts/approval-process-v2.6-apaasv5.yaml
 
 # 4. Uninstall
 helm uninstall \
 approval-process \
---namespace apaas-v5-approval
+--namespace approval-process
 
 
 # 5. Template
 helm template \
 approval-process \
-/etc/kubernetes/charts/approval-process-2.5.1.tgz \
---namespace apaas-v5-approval \
--f /etc/kubernetes/charts/approval-process-2.5.1.yaml >  /etc/kubernetes/charts/approval-process-dist.yaml
+/etc/kubernetes/charts/approval-process-v2.6-apaasv5.tgz \
+--namespace approval-process \
+-f /etc/kubernetes/charts/approval-process-v2.6-apaasv5.yaml >  /etc/kubernetes/charts/approval-process-dist.yaml
 ```
\ No newline at end of file

sql文件/approval-process-form_init.sql

+ALTER TABLE dict_type ADD COLUMN source int4;
+COMMENT ON COLUMN dict_type.source IS '来源（0：用户字典1：系统字典）';
+ALTER TABLE dict ADD COLUMN source int4;
+COMMENT ON COLUMN dict.source IS '来源（0：用户字典1：系统字典）';
+ALTER TABLE "public"."dict_type" ADD COLUMN "created_by" varchar(255);
+COMMENT ON COLUMN "public"."dict_type"."created_by" IS '创建人';
+ALTER TABLE "public"."dict_type" ADD COLUMN "created_time" timestamp, ADD COLUMN "updated_by" varchar(255), ADD COLUMN "updated_time" timestamp;
+COMMENT ON COLUMN "public"."dict_type"."created_time" IS '创建时间';
+COMMENT ON COLUMN "public"."dict_type"."updated_by" IS '修改人';
+COMMENT ON COLUMN "public"."dict_type"."updated_time" IS '修改时间';
+
+update dict_type set source = 1 where id in ('fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', 'b9ab1b7c-dc4c-4a26-af32-b6b3c418189e');
+
+INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('8cc99bb5-2294-40d3-9c30-0d146284b90b', '手机号', '/%5E(13%5B0-9%5D%7C14%5B5%7C7%5D%7C15%5B0%7C1%7C2%7C3%7C4%7C5%7C6%7C7%7C8%7C9%5D%7C18%5B0%7C1%7C2%7C3%7C5%7C6%7C7%7C8%7C9%5D)%5Cd%7B8%7D$/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '', '0', 'putong', '2022-05-10 17:13:37', 'putong', '2022-05-16 16:15:28', 0, '0');
+INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('ed09635f-6838-4ac0-9b7b-c7f571eace24', '数据校验', '/%5E%5B0-9%5D+(%5C.%5B0-9%5D%7B2%7D)?$/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '有两位小数的正实数', '0', 'putong', '2022-05-10 17:44:46', 'putong', '2022-08-19 13:46:05', 1, '0');
+INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('cb7f3e18-7182-45df-9f84-2c8ff6b53950', '身份证号', '/(%5E%5Cd%7B15%7D$)%7C(%5E%5Cd%7B18%7D$)%7C(%5E%5Cd%7B17%7D(%5Cd%7CX%7Cx)$)/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '身份证号查验', '0', 'putong', '2022-05-10 17:50:16', 'putong', '2022-05-16 16:15:28', 0, '0');
+INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('59a3d45d-b77d-4ef1-9ab0-d557cb413e72', '数字', '/%5E%5B0-9%5D*$/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '0-9的数字', '0', 'putong', '2022-05-10 13:59:02', 'putong', '2022-05-16 16:15:28', 0, '0');

sql文件/approval_form.sql

+--form库（如：approva-forml-apass5-test）新增流程分类（apaas流程）
+delete  from  dict_type where id='b9ab1b7c-dc4c-4a26-af32-b6b3c418189e' or name='流程分类';
+INSERT INTO "public"."dict_type" ("id", "name", "sort", "source", "created_by", "created_time", "updated_by", "updated_time") VALUES ('b9ab1b7c-dc4c-4a26-af32-b6b3c418189e', '流程分类', 2, 1, NULL, NULL, NULL, NULL);
+delete  from  dict where id='bda2e235-e9ab-4358-89fa-6575fc85045f' or dict_name='aPaaS流程';
+INSERT INTO "public"."dict" ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id", "source") VALUES ('bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', 'aPaaS\u6D41\u7A0B', 'b9ab1b7c-dc4c-4a26-af32-b6b3c418189e', '', '0', 'admin', '2023-09-08 16:53:18', 'admin', '2023-09-08 16:53:18', 0, '0', 0);

templates/approval-form/deployment.yaml

 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: approval-form
+  name: {{ .Release.Name }}-form-ui
   labels:
-    app.kubernetes.io/name: approval-form
+    app.kubernetes.io/name: {{ .Release.Name }}-form-ui
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-form
+    app: {{ .Release.Name }}-form-ui
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: approval-form
+      app: {{ .Release.Name }}-form-ui
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: approval-form
+        app.kubernetes.io/name: {{ .Release.Name }}-form-ui
         helm.sh/chart: '{{ template "approval-process.chart" . }}'
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-        app: approval-form
+        app: {{ .Release.Name }}-form-ui
     spec:
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
       containers:
-        - name: approval-form
+        - name: {{ .Release.Name }}-form-ui
           {{- if contains "/" .Values.approvalForm.image.repository }}
           image: "{{ .Values.approvalForm.image.repository }}:{{ .Values.approvalForm.image.tag }}{{ include "beagle.imageArch" . }}"
           {{- else }}
@@ -37,7 +37,7 @@ spec:
           resources:
             {{- toYaml .Values.approvalForm.resources | nindent 12 }}
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               name: http
               protocol: TCP     
           volumeMounts:

templates/approval-form/ingressroute.yaml

@@ -3,13 +3,13 @@
 kind: IngressRoute
 apiVersion: bcc.bd-apaas.com/v1alpha1
 metadata:
-  name: approval-form
+  name: {{ .Release.Name }}-form-ui
   labels:
-    app.kubernetes.io/name: approval-form
+    app.kubernetes.io/name: {{ .Release.Name }}-form-ui
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-form
+    app: {{ .Release.Name }}-form-ui
 spec:
   entryPoints:
     - websecure
@@ -18,7 +18,7 @@ spec:
       match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval/form`)
       services:
         - kind: Service
-          name: approval-form
+          name: {{ .Release.Name }}-form-ui
           port: 80
   tls: {}
 {{- end }}
\ No newline at end of file

templates/approval-form/service.yaml

@@ -2,13 +2,13 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: approval-form
+  name: {{ .Release.Name }}-form-ui
   labels:
-    app.kubernetes.io/name: approval-form
+    app.kubernetes.io/name: {{ .Release.Name }}-form-ui
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-form
+    app: {{ .Release.Name }}-form-ui
 spec:
   ports:
     - name: http
@@ -16,4 +16,4 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    app: approval-form
+    app: {{ .Release.Name }}-form-ui
\ No newline at end of file

templates/approval-process-engine/configmap.yaml

@@ -2,9 +2,9 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: approval-process-engine-config
+  name: {{ .Release.Name }}-engine-config
   labels:
-    app.kubernetes.io/name: approval-process-engine-config
+    app.kubernetes.io/name: {{ .Release.Name }}-engine-config
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"

templates/approval-process-engine/deployment.yaml

 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: approval-process-engine
+  name: {{ .Release.Name }}-engine
   labels:
-    app.kubernetes.io/name: approval-process-engine
+    app.kubernetes.io/name: {{ .Release.Name }}-engine
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-process-engine
+    app: {{ .Release.Name }}-engine
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: approval-process-engine
+      app: {{ .Release.Name }}-engine
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: approval-process-engine
+        app.kubernetes.io/name: {{ .Release.Name }}-engine
         helm.sh/chart: '{{ template "approval-process.chart" . }}'
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-        app: approval-process-engine
+        app: {{ .Release.Name }}-engine
     spec:
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
       containers:
-        - name: approval-process-engine
+        - name: {{ .Release.Name }}-engine
           {{- if contains "/" .Values.approvalProcessEngine.image.repository }}
           image: "{{ .Values.approvalProcessEngine.image.repository }}:{{ .Values.approvalProcessEngine.image.tag }}{{ include "beagle.imageArch" . }}"
           {{- else }}
@@ -45,7 +45,7 @@ spec:
               mountPath: /etc/localtime
           envFrom:
             - configMapRef:
-                name: approval-process-engine-config
+                name: {{ .Release.Name }}-engine-config
 
 
 

templates/approval-process-engine/ingressroute.yaml

@@ -3,13 +3,13 @@
 kind: IngressRoute
 apiVersion: bcc.bd-apaas.com/v1alpha1
 metadata:
-  name: approval-process-engine
+  name: {{ .Release.Name }}-engine
   labels:
-    app.kubernetes.io/name: approval-process-engine
+    app.kubernetes.io/name: {{ .Release.Name }}-engine
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-process-engine
+    app: {{ .Release.Name }}-engine
 spec:
   entryPoints:
     - websecure
@@ -18,7 +18,7 @@ spec:
       match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval-process`)
       services:
         - kind: Service
-          name: approval-process-engine
+          name: {{ .Release.Name }}-engine
           port: 80
   tls: {}
 {{- end }}
\ No newline at end of file

templates/approval-process-engine/service.yaml

@@ -2,13 +2,13 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: approval-process-engine
+  name: {{ .Release.Name }}-engine
   labels:
-    app.kubernetes.io/name: approval-process-engine
+    app.kubernetes.io/name: {{ .Release.Name }}-engine
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-process-engine
+    app: {{ .Release.Name }}-engine
 spec:
   ports:
     - name: http
@@ -16,4 +16,4 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    app: approval-process-engine
+    app: {{ .Release.Name }}-engine
\ No newline at end of file

templates/approval-process-form/configmap.yaml

@@ -2,9 +2,9 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: approval-process-form-config
+  name: {{ .Release.Name }}-form-config
   labels:
-    app.kubernetes.io/name: approval-process-form-config
+    app.kubernetes.io/name: {{ .Release.Name }}-form-config
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"

templates/approval-process-form/deployment.yaml

 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: approval-process-form
+  name: {{ .Release.Name }}-form
   labels:
-    app.kubernetes.io/name: approval-process-form
+    app.kubernetes.io/name: {{ .Release.Name }}-form
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-process-form
+    app: {{ .Release.Name }}-form
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: approval-process-form
+      app: {{ .Release.Name }}-form
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: approval-process-form
+        app.kubernetes.io/name: {{ .Release.Name }}-form
         helm.sh/chart: '{{ template "approval-process.chart" . }}'
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-        app: approval-process-form
+        app: {{ .Release.Name }}-form
     spec:
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
       containers:
-        - name: approval-process-form
+        - name: {{ .Release.Name }}-form
           {{- if contains "/" .Values.approvalProcessForm.image.repository }}
           image: "{{ .Values.approvalProcessForm.image.repository }}:{{ .Values.approvalProcessForm.image.tag }}{{ include "beagle.imageArch" . }}"
           {{- else }}
@@ -65,7 +65,7 @@ spec:
               mountPath: /etc/localtime
           envFrom:
             - configMapRef:
-                name: approval-process-form-config
+                name: {{ .Release.Name }}-form-config
 
 
 

templates/approval-process-form/ingressroute.yaml

@@ -3,13 +3,13 @@
 kind: IngressRoute
 apiVersion: bcc.bd-apaas.com/v1alpha1
 metadata:
-  name: approval-process-form
+  name: {{ .Release.Name }}-form
   labels:
-    app.kubernetes.io/name: approval-process-form
+    app.kubernetes.io/name: {{ .Release.Name }}-form
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-process-form
+    app: {{ .Release.Name }}-form
 spec:
   entryPoints:
     - websecure
@@ -18,7 +18,7 @@ spec:
       match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval-form`)
       services:
         - kind: Service
-          name: approval-process-form
+          name: {{ .Release.Name }}-form
           port: 80
   tls: {}
 {{- end }}
\ No newline at end of file

templates/approval-process-form/service.yaml

@@ -2,13 +2,13 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: approval-process-form
+  name: {{ .Release.Name }}-form
   labels:
-    app.kubernetes.io/name: approval-process-form
+    app.kubernetes.io/name: {{ .Release.Name }}-form
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-process-form
+    app: {{ .Release.Name }}-form
 spec:
   ports:
     - name: http
@@ -16,4 +16,4 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    app: approval-process-form
+    app: {{ .Release.Name }}-form
\ No newline at end of file

templates/approval-ui/deployment.yaml

 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: approval-ui
+  name: {{ .Release.Name }}-ui
   labels:
-    app.kubernetes.io/name: approval-ui
+    app.kubernetes.io/name: {{ .Release.Name }}-ui
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-ui
+    app: {{ .Release.Name }}-ui
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: approval-ui
+      app: {{ .Release.Name }}-ui
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: approval-ui
+        app.kubernetes.io/name: {{ .Release.Name }}-ui
         helm.sh/chart: '{{ template "approval-process.chart" . }}'
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-        app: approval-ui
+        app: {{ .Release.Name }}-ui
     spec:
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
       containers:
-        - name: approval-ui
+        - name: {{ .Release.Name }}-ui
           {{- if contains "/" .Values.approvalUi.image.repository }}
           image: "{{ .Values.approvalUi.image.repository }}:{{ .Values.approvalUi.image.tag }}{{ include "beagle.imageArch" . }}"
           {{- else }}
@@ -37,7 +37,7 @@ spec:
           resources:
             {{- toYaml .Values.approvalUi.resources | nindent 12 }}
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               name: http
               protocol: TCP     
           volumeMounts:

templates/approval-ui/ingressroute.yaml

@@ -3,13 +3,13 @@
 kind: IngressRoute
 apiVersion: bcc.bd-apaas.com/v1alpha1
 metadata:
-  name: approval-ui
+  name: {{ .Release.Name }}-ui
   labels:
-    app.kubernetes.io/name: approval-ui
+    app.kubernetes.io/name: {{ .Release.Name }}-ui
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-ui
+    app: {{ .Release.Name }}-ui
 spec:
   entryPoints:
     - websecure
@@ -18,7 +18,7 @@ spec:
       match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval/ui`)
       services:
         - kind: Service
-          name: approval-ui
+          name: {{ .Release.Name }}-ui
           port: 80
   tls: {}
 {{- end }}
\ No newline at end of file

templates/approval-ui/service.yaml

@@ -2,13 +2,13 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: approval-ui
+  name: {{ .Release.Name }}-ui
   labels:
-    app.kubernetes.io/name: approval-ui
+    app.kubernetes.io/name: {{ .Release.Name }}-ui
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: approval-ui
+    app: {{ .Release.Name }}-ui
 spec:
   ports:
     - name: http
@@ -16,4 +16,4 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    app: approval-ui
+    app: {{ .Release.Name }}-ui
\ No newline at end of file

templates/ingresshost.yaml

@@ -3,7 +3,7 @@
 apiVersion: bcc.bd-apaas.com/v1alpha1
 kind: IngressHost
 metadata:
-  name: approval-process
+  name: {{ .Release.Name }}
 spec:
   host: "{{ .Values.global.ingressroute.host }}"
 {{- end }}

templates/process-importer/configmap.yaml

@@ -2,9 +2,9 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: process-importer-config
+  name: {{ .Release.Name }}-importer-config
   labels:
-    app.kubernetes.io/name: process-importer-config
+    app.kubernetes.io/name: {{ .Release.Name }}-importer-config
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"

templates/process-importer/deployment.yaml

 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: process-importer
+  name: {{ .Release.Name }}-importer
   labels:
-    app.kubernetes.io/name: process-importer
+    app.kubernetes.io/name: {{ .Release.Name }}-importer
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: process-importer
+    app: {{ .Release.Name }}-importer
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: process-importer
+      app: {{ .Release.Name }}-importer
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: process-importer
+        app.kubernetes.io/name: {{ .Release.Name }}-importer
         helm.sh/chart: '{{ template "approval-process.chart" . }}'
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-        app: process-importer
+        app: {{ .Release.Name }}-importer
     spec:
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
       containers:
-        - name: process-importer
+        - name: {{ .Release.Name }}-importer
           {{- if contains "/" .Values.processImporter.image.repository }}
           image: "{{ .Values.processImporter.image.repository }}:{{ .Values.processImporter.image.tag }}{{ include "beagle.imageArch" . }}"
           {{- else }}
@@ -45,7 +45,7 @@ spec:
               mountPath: /etc/localtime
           envFrom:
             - configMapRef:
-                name: process-importer-config
+                name: {{ .Release.Name }}-importer-config
 
 
 

templates/process-importer/service.yaml

@@ -2,13 +2,13 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: process-importer
+  name: {{ .Release.Name }}-importer
   labels:
-    app.kubernetes.io/name: process-importer
+    app.kubernetes.io/name: {{ .Release.Name }}-importer
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: process-importer
+    app: {{ .Release.Name }}-importer
 spec:
   ports:
     - name: http
@@ -16,4 +16,4 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    app: process-importer
+    app: {{ .Release.Name }}-importer
\ No newline at end of file

templates/zeebe/configmap.yaml

@@ -2,9 +2,9 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: zeebe-application
+  name: {{ .Release.Name }}-zeebe-application
   labels:
-    app.kubernetes.io/name: zeebe
+    app.kubernetes.io/name: {{ .Release.Name }}-zeebe
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"

templates/zeebe/service.yaml

@@ -2,13 +2,13 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: zeebe
+  name: {{ .Release.Name }}-zeebe
   labels:
-    app.kubernetes.io/name: zeebe
+    app.kubernetes.io/name: {{ .Release.Name }}-zeebe
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: zeebe
+    app: {{ .Release.Name }}-zeebe
 spec:
   ports:
     - name: gateway
@@ -28,4 +28,4 @@ spec:
       protocol: TCP
       targetPort: 5701
   selector:
-    app: zeebe
+    app: {{ .Release.Name }}-zeebe
\ No newline at end of file

templates/zeebe/statefulset.yaml

@@ -2,18 +2,18 @@
 kind: StatefulSet
 apiVersion: apps/v1
 metadata:
-  name: zeebe
+  name: {{ .Release.Name }}-zeebe
   labels:
-    app.kubernetes.io/name: zeebe
+    app.kubernetes.io/name: {{ .Release.Name }}-zeebe
     helm.sh/chart: '{{ template "approval-process.chart" . }}'
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-    app: zeebe
+    app: {{ .Release.Name }}-zeebe
 spec:
-  serviceName: zeebe
+  serviceName: {{ .Release.Name }}-zeebe
   selector:
     matchLabels:
-      app: zeebe
+      app: {{ .Release.Name }}-zeebe
   {{- if .Values.zeebe.persistence.enabled }}
   volumeClaimTemplates:
     - metadata:
@@ -30,11 +30,11 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: zeebe
+        app.kubernetes.io/name: {{ .Release.Name }}-zeebe
         helm.sh/chart: '{{ template "approval-process.chart" . }}'
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
         app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-        app: zeebe
+        app: {{ .Release.Name }}-zeebe
     spec:
       volumes:
         - name: localtime
@@ -42,12 +42,12 @@ spec:
             path: /etc/localtime
         - name: application
           configMap:
-            name: zeebe-application
+            name: {{ .Release.Name }}-zeebe-application
             items:
               - key: application.yaml
                 path: application.yaml
       containers:
-        - name: zeebe
+        - name: {{ .Release.Name }}-zeebe
           {{- if contains "/" .Values.zeebe.image.repository }}
           image: "{{ .Values.zeebe.image.repository }}:{{ .Values.zeebe.image.tag }}{{ include "beagle.imageArch" . }}"
           {{- else }}

values.yaml

@@ -14,7 +14,7 @@ global:
 approvalForm:
   image:
     repository: "hub.wodcloud.com/workflow/approval-form"
-    tag: "1.0.0-form-alpha"
+    tag: "2.6.0-form-alpha"
   resources: 
     limits:
       cpu: 0.5
@@ -26,7 +26,7 @@ approvalForm:
 approvalProcessEngine:
   image:
     repository: "approval-process-engine"
-    tag: "2.5.1-apass5"
+    tag: "2.6-apass5"
   conf:
     apiTokenKey: API_AUTH_TOKEN
     apiTokenValue: c78aa1d9-4ab4-4c9c-97cc-a9a548ea38aa
@@ -53,7 +53,7 @@ approvalProcessEngine:
 approvalProcessForm:
   image:
     repository: "approval-process-form"
-    tag: "2.5.0-apass5"
+    tag: "2.6-apass5"
   conf:
     #数据库地址
     dbDns: jdbc:postgresql://postgres.workflow:5432/approva-form-apass5-demo?stringtype=unspecified&TimeZone=Asia/Shanghai
@@ -80,7 +80,7 @@ approvalProcessForm:
 approvalUi:
   image:
     repository: "hub.wodcloud.com/workflow/approval-ui"
-    tag: "2.5-alpha"
+    tag: "2.6-alph"
 
 processImporter:
   image:
@@ -111,6 +111,7 @@ zeebe:
     enabled: true
     storageClass: hostpath
     
+#服务配置的redis连接地址，需要和apaas中配置的地址保持一致
 redis:
   enabled: false
   image: