From 27e2644a8c5759e07bce3920a487b42337b8407d Mon Sep 17 00:00:00 2001 From: LidolLxf <13660354959@163.com> Date: Fri, 27 Dec 2024 15:42:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=9A=E4=B8=AA=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/tmpl/filetmpl/schema/PersistentVolume.yaml | 3 +++ .../tmpl/filetmpl/schema/PersistentVolumeClaim.yaml | 1 + .../pkg/resource/form/tmpl/filetmpl/schema/hpa.tpl | 1 + .../resource/form/tmpl/filetmpl/schema/network.tpl | 12 ++++++------ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolume.yaml b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolume.yaml index 6f7bb424da..6571387d1b 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolume.yaml +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolume.yaml @@ -80,6 +80,7 @@ properties: accessModes: title: {{ i18n "访问模式" .lang }} type: array + default: ["ReadWriteOnce"] items: type: string ui:component: @@ -99,6 +100,7 @@ properties: message: {{ i18n "至少选择一个 AccessMode" .lang }} scName: title: {{ i18n "存储类名称" .lang }} + default: fast-storage type: string storageSize: title: {{ i18n "容量" .lang }} @@ -113,6 +115,7 @@ properties: localPath: title: Path type: string + default: /tmp/data ui:rules: - validator: "{{`{{`}} $self.getValue('spec.type') !== 'local' || $self.value {{`}}`}}" message: {{ i18n "值不能为空" .lang }} diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolumeClaim.yaml b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolumeClaim.yaml index 54f07637d3..915a50e4cc 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolumeClaim.yaml +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/PersistentVolumeClaim.yaml @@ -93,6 +93,7 @@ properties: accessModes: title: {{ i18n "访问模式" .lang }} type: array + default: ["ReadWriteOnce"] items: type: string ui:component: diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/hpa.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/hpa.tpl index 04cd974a72..df12e20336 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/hpa.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/hpa.tpl @@ -50,6 +50,7 @@ ref: resName: title: {{ i18n "资源名称" .lang }} type: string + default: deployment-test ui:rules: - required minReplicas: diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl index 0fd0ce8801..ea9b1c1029 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl @@ -59,6 +59,7 @@ ruleConf: path: title: {{ i18n "路径" .lang }} type: string + default: /testpath ui:rules: - required - maxLength128 @@ -67,11 +68,13 @@ ruleConf: targetSVC: title: {{ i18n "目标 Service" .lang }} type: string + default: test ui:rules: - required port: title: {{ i18n "端口" .lang }} type: integer + default: 80 ui:component: props: min: 1 @@ -136,6 +139,7 @@ network: existLBID: title: "CLB ID" type: string + default: lb-c5xxxxd6 ui:component: props: placeholder: {{ i18n "例如：lb-c5xxxxd6" .lang | quote }} @@ -337,6 +341,7 @@ portConf: port: title: {{ i18n "监听端口" .lang }} type: integer + default: 80 ui:component: props: min: 1 @@ -360,6 +365,7 @@ portConf: targetPort: title: {{ i18n "目标端口" .lang }} type: string + default: "80" ui:rules: - validator: "{{`{{`}} $self.value {{`}}`}}" message: {{ i18n "值不能为空" .lang }} @@ -399,10 +405,6 @@ portConf: selector: title: {{ i18n "选择器" .lang }} type: object - required: - - associatedResources - - associatedApplications - - labels properties: associatedResources: title: {{ i18n "关联资源" .lang }} @@ -437,8 +439,6 @@ selector: value: "" actions: - "{{`{{`}} $loadDataSource {{`}}`}}" - ui:rules: - - required labels: title: {{ i18n "标签选择器" .lang }} type: array From c15faed13bb68fe324533c5d1af853b5fe36cd6a Mon Sep 17 00:00:00 2001 From: LidolLxf <13660354959@163.com> Date: Fri, 27 Dec 2024 17:33:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A4=9A=E4=B8=AA=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=90=8D=E7=A7=B0=E6=96=B0=E5=A2=9Erfc=201123=20label?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cluster-resources/pkg/i18n/locale/lc_msgs.yaml | 2 ++ .../pkg/resource/form/renderer/schema.go | 4 ++++ .../resource/form/tmpl/filetmpl/schema/network.tpl | 1 + .../resource/form/tmpl/filetmpl/schema/volume.tpl | 12 ++++++------ .../pkg/resource/form/tmpl/schema/common.tpl | 4 ++-- .../pkg/resource/form/tmpl/schema/network.tpl | 1 + .../pkg/resource/form/tmpl/schema/volume.tpl | 12 ++++++------ 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/bcs-services/cluster-resources/pkg/i18n/locale/lc_msgs.yaml b/bcs-services/cluster-resources/pkg/i18n/locale/lc_msgs.yaml index d610aba5d8..1edb13ab68 100644 --- a/bcs-services/cluster-resources/pkg/i18n/locale/lc_msgs.yaml +++ b/bcs-services/cluster-resources/pkg/i18n/locale/lc_msgs.yaml @@ -72,6 +72,8 @@ en: "value required" - msgID: "仅支持小写字母，数字及 '-' 且需以字母数字开头和结尾" en: "only lowercase letters, numbers and '-' are supported and must start and end with an alphanumeric" +- msgID: "必须由小写字母数字字符或'-'组成，并且必须以字母数字字符开头和结尾" + en: "must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character" - msgID: 仅可包含数字字符与小数点 en: "can only contain numeric characters and decimal points" - msgID: 超过长度限制（64） diff --git a/bcs-services/cluster-resources/pkg/resource/form/renderer/schema.go b/bcs-services/cluster-resources/pkg/resource/form/renderer/schema.go index 722ee28cc2..a2635c65e3 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/renderer/schema.go +++ b/bcs-services/cluster-resources/pkg/resource/form/renderer/schema.go @@ -169,6 +169,10 @@ func genSchemaRules(ctx context.Context) map[string]interface{} { "validator": "/^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*|{{.*}})$/", "message": i18n.GetMsg(ctx, "仅支持小写字母，数字及 '-' 且需以字母数字开头和结尾"), }, + "rfc1123LabelRegex": map[string]interface{}{ + "validator": "/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/", + "message": i18n.GetMsg(ctx, "必须由小写字母数字字符或'-'组成，并且必须以字母数字字符开头和结尾"), + }, "numberRegex": map[string]interface{}{ "validator": "/^[0-9]+(\\.[0-9])?[0-9]*$/", "message": i18n.GetMsg(ctx, "仅可包含数字字符与小数点"), diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl index ea9b1c1029..76049d7578 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/network.tpl @@ -338,6 +338,7 @@ portConf: type: string ui:rules: - maxLength64 + - rfc1123LabelRegex port: title: {{ i18n "监听端口" .lang }} type: integer diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/volume.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/volume.tpl index 9581ef21cd..20f7d41e19 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/volume.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/filetmpl/schema/volume.tpl @@ -11,7 +11,7 @@ pvc: ui:rules: - required - maxLength64 - - nameRegexWithVar + - rfc1123LabelRegex pvcName: title: PersistentVolumeClaim type: string @@ -53,7 +53,7 @@ hostPath: ui:rules: - required - maxLength128 - - nameRegexWithVar + - rfc1123LabelRegex path: title: {{ i18n "路径或节点" .lang }} type: string @@ -105,7 +105,7 @@ configMap: ui:rules: - required - maxLength128 - - nameRegexWithVar + - rfc1123LabelRegex defaultMode: title: {{ i18n "默认模式" .lang }} type: string @@ -168,7 +168,7 @@ secret: ui:rules: - required - maxLength128 - - nameRegexWithVar + - rfc1123LabelRegex defaultMode: title: {{ i18n "默认模式" .lang }} type: string @@ -228,7 +228,7 @@ emptyDir: ui:rules: - required - maxLength128 - - nameRegexWithVar + - rfc1123LabelRegex ui:component: name: bfArray ui:props: @@ -248,7 +248,7 @@ nfs: ui:rules: - required - maxLength128 - - nameRegexWithVar + - rfc1123LabelRegex path: title: {{ i18n "路径" .lang }} type: string diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/common.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/common.tpl index a61261c5f5..c6cea3220a 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/common.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/common.tpl @@ -38,7 +38,7 @@ metadata: ui:rules: - required - maxLength128 - - nameRegex + - rfc1123LabelRegex namespace: title: {{ i18n "命名空间" .lang }} type: string @@ -63,7 +63,7 @@ metadata: ui:rules: - required - maxLength64 - - nameRegex + - rfc1123LabelRegex labels: title: {{ i18n "标签" .lang }} type: array diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/network.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/network.tpl index fabc8fda97..e1de21485b 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/network.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/network.tpl @@ -395,6 +395,7 @@ portConf: type: string ui:rules: - maxLength64 + - rfc1123LabelRegex port: title: {{ i18n "监听端口" .lang }} type: integer diff --git a/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/volume.tpl b/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/volume.tpl index c403608e8f..779df9d2c2 100644 --- a/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/volume.tpl +++ b/bcs-services/cluster-resources/pkg/resource/form/tmpl/schema/volume.tpl @@ -11,7 +11,7 @@ pvc: ui:rules: - required - maxLength64 - - nameRegex + - rfc1123LabelRegex pvcName: title: PersistentVolumeClaim type: string @@ -59,7 +59,7 @@ hostPath: ui:rules: - required - maxLength128 - - nameRegex + - rfc1123LabelRegex path: title: {{ i18n "路径或节点" .lang }} type: string @@ -111,7 +111,7 @@ configMap: ui:rules: - required - maxLength128 - - nameRegex + - rfc1123LabelRegex defaultMode: title: {{ i18n "默认模式" .lang }} type: string @@ -189,7 +189,7 @@ secret: ui:rules: - required - maxLength128 - - nameRegex + - rfc1123LabelRegex defaultMode: title: {{ i18n "默认模式" .lang }} type: string @@ -264,7 +264,7 @@ emptyDir: ui:rules: - required - maxLength128 - - nameRegex + - rfc1123LabelRegex ui:component: name: bfArray ui:props: @@ -284,7 +284,7 @@ nfs: ui:rules: - required - maxLength128 - - nameRegex + - rfc1123LabelRegex path: title: {{ i18n "路径" .lang }} type: string