Skip to content

Commit 642a4c1

Browse files
committed
update mysql parameters auth.password and fix regex
Signed-off-by: xingcan-ltc <[email protected]>
1 parent 5d5d812 commit 642a4c1

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

catalog/mysql/apps/mysql.app/app.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ spec:
1313
properties:
1414
version: "9.23.0"
1515
architecture: "replication"
16-
auth:
17-
rootPassword: Kdp@mysql123
18-
replicationPassword: Replicat@mysql123
19-
username: bdos_dba
20-
password: KdpDba@mysql123
2116
resources:
2217
limits:
2318
cpu: '2.0'

catalog/mysql/x-definitions/app-mysql.cue

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -348,28 +348,29 @@ template: {
348348
// +ui:order=4
349349
auth: {
350350
// +ui:description=mysql root的密码, 初次安装时使用此配置,应用更新时更改此配置mysql密码保持不变, 可在应用端修改密码后更新配置,以供其他应用使用。
351-
// +pattern=^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()-_=+[\]{}|;:'",.<>?/]).{8,}$
351+
// +pattern=(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[\W_]).{8,}
352352
// +ui:options={"format": "password", "showPassword": true}
353353
// +ui:order=1
354354
// +err:options={"pattern":"密码要求如下:\n1、长度大于8个字符\n2、密码中至少包含大小写字母、数字、特殊字符"}
355-
rootPassword: string
355+
rootPassword: *"Kdp@mysql123" | string
356356
// +ui:description=mysql 备份用户的密码, 初次安装时使用此配置,应用更新时更改此配置mysql密码保持不变, 可在应用端修改密码后更新配置,以供其他应用使用。
357-
// +pattern=^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()-_=+[\]{}|;:'",.<>?/]).{8,}$
357+
// +pattern=(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[\W_]).{8,}
358358
// +ui:options={"showPassword": true}
359359
// +ui:order=2
360360
// +err:options={"pattern":"密码要求如下:\n1、长度大于8个字符\n2、密码中至少包含大小写字母、数字、特殊字符"}
361361
// +ui:hidden={{rootFormData.architecture == "standalone"}}
362-
replicationPassword: string
362+
replicationPassword: *"Replicat@mysql123" | string
363363
// +ui:description=mysql dba用户名
364364
// +ui:options={"disabled": true}
365365
// +ui:order=3
366366
username: *"bdos_dba" | string
367367
// +ui:description=mysql dba密码, 初次安装时使用此配置,应用更新时更改此配置mysql密码保持不变, 可在应用端修改密码后更新配置,以供其他应用使用。
368-
// +pattern=^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[!@#$%^&*()-_=+[\]{}|;:'",.<>?/]).{8,}$
368+
// +pattern=^(?!.*@)(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[\W_]).{8,}$
369369
// +ui:options={"showPassword": true}
370370
// +ui:order=4
371-
// +err:options={"pattern":"密码要求如下:\n1、长度大于8个字符\n2、密码中至少包含大小写字母、数字、特殊字符"}
372-
password: string
371+
// +err:options={"pattern":"密码要求如下:\n1、长度大于8个字符\n2、密码中至少包含大小写字母、数字、特殊字符且不包含@"}
372+
// +ui:hidden={{rootFormData.architecture == "standalone"}}"}
373+
password: *"KdpDbamysql123" | string
373374
}
374375
// +ui:description=mysql资源配置
375376
// +ui:order=5

0 commit comments

Comments
 (0)