fix: dbprovider resource already exists problem (#4560)

Signed-off-by: jingyang <3161362058@qq.com>
labring · Mar 6, 2024 · 1e54b69 · 1e54b69
1 parent c921451
commit 1e54b69
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/frontend/providers/dbprovider/src/pages/db/edit/index.tsx b/frontend/providers/dbprovider/src/pages/db/edit/index.tsx
@@ -66,18 +66,18 @@ const EditApp = ({ dbName, tabType }: { dbName?: string; tabType?: 'form' | 'yam
 
   const generateYamlList = (data: DBEditType) => {
     return [
-      {
-        filename: 'cluster.yaml',
-        value: json2CreateCluster(data)
-      },
       ...(isEdit
         ? []
         : [
             {
               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
diff --git 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);