diff --git a/frontend/providers/dbprovider/src/pages/db/edit/index.tsx b/frontend/providers/dbprovider/src/pages/db/edit/index.tsx index fb05f429e9d4..d21739aa0728 100644 --- a/frontend/providers/dbprovider/src/pages/db/edit/index.tsx +++ b/frontend/providers/dbprovider/src/pages/db/edit/index.tsx @@ -66,10 +66,6 @@ const EditApp = ({ dbName, tabType }: { dbName?: string; tabType?: 'form' | 'yam const generateYamlList = (data: DBEditType) => { return [ - { - filename: 'cluster.yaml', - value: json2CreateCluster(data) - }, ...(isEdit ? [] : [ @@ -77,7 +73,11 @@ const EditApp = ({ dbName, tabType }: { dbName?: string; tabType?: 'form' | 'yam filename: 'account.yaml', value: json2Account(data) } - ]) + ]), + { + filename: 'cluster.yaml', + value: json2CreateCluster(data) + } ]; }; diff --git a/frontend/providers/kubepanel/public/logo.svg b/frontend/providers/kubepanel/public/logo.svg index 6a6bb3dd0ae5..943b7a432b6f 100644 --- a/frontend/providers/kubepanel/public/logo.svg +++ b/frontend/providers/kubepanel/public/logo.svg @@ -1,3 +1,9 @@ - - - + + + + + + + + + \ No newline at end of file diff --git a/service/license/src/pages/cluster/components/ConfigForm.tsx b/service/license/src/pages/cluster/components/ConfigForm.tsx index 2bc586e4c6ed..5a98c6875b5b 100644 --- a/service/license/src/pages/cluster/components/ConfigForm.tsx +++ b/service/license/src/pages/cluster/components/ConfigForm.tsx @@ -62,8 +62,8 @@ export default function CommandForm({ }, k8sVersion: '1.25.6', podSubnet: '100.64.0.0/10', - serviceSubnet: '100.96.0.0/22', - selfSigned: false, + serviceSubnet: '10.96.0.0/22', + selfSigned: true, cloudPort: '443', useImageRegistry: true, imageRegistry: 'registry.cn-shanghai.aliyuncs.com', @@ -132,7 +132,8 @@ export default function CommandForm({ data?.certKeyPath ? ` --key-path=${data?.certKeyPath} ` : '', data?.ssh.useKey ? ` --ssh-private-key=${data?.ssh.path} ` - : ` --ssh-password=${data?.ssh.password} ` + : ` --ssh-password=${data?.ssh.password} `, + data?.k8sVersion ? ` --kubernetes-version=${data.k8sVersion} ` : '' ]; const displayCommand = commandParts.filter(Boolean).join('\\\n'); setCopyCommand(displayCommand);