Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix:dbprovider number of database instances #4580

Merged
merged 2 commits into from Mar 13, 2024
Merged

fix:dbprovider number of database instances #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1bf8aa
fix:dbprovider number of database instances
zjy365 Mar 11, 2024
2b91687
fix db secret
zjy365 Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/providers/dbprovider/public/locales/en/common.json
View file
Open in desktop
Expand Up @@ -262,5 +262,6 @@
"db instances tip": "The number of {{db}} instances is recommended to be an odd number",
"Deleting": "Deleting",
"Backup Running": "Backup Running",
"Backup Deleting": "Backup Deleting"
}
"Backup Deleting": "Backup Deleting",
"DataBase": "DataBase"
}
5 changes: 3 additions & 2 deletions frontend/providers/dbprovider/public/locales/zh/common.json
View file
Open in desktop
Expand Up @@ -265,5 +265,6 @@
"db instances tip": "{{db}} 实例数量建议为奇数",
"Deleting": "删除中",
"Backup Running": "备份中",
"Backup Deleting": "删除中"
}
"Backup Deleting": "删除中",
"DataBase": "数据库"
}
6 changes: 3 additions & 3 deletions frontend/providers/dbprovider/src/pages/api/getSecretByName.ts
View file
Open in desktop
Expand Up @@ -94,9 +94,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
'base64'
).toString('utf-8');

const host = Buffer.from(secret.body.data[dbTypeMap[dbType].hostKey], 'base64').toString(
'utf-8'
);
const host =
Buffer.from(secret.body.data[dbTypeMap[dbType].hostKey], 'base64').toString('utf-8') +
`.${namespace}.svc`;

const port = Buffer.from(secret.body.data[dbTypeMap[dbType].portKey], 'base64').toString(
'utf-8'
Expand Down
23 changes: 11 additions & 12 deletions frontend/providers/dbprovider/src/pages/db/edit/components/Form.tsx
View file
Open in desktop
Expand Up @@ -173,17 +173,6 @@ const Form = ({
fontWeight: 'bold',
borderColor: 'myGray.900'
}}
// {...(activeNav === item.id
// ? {
// fontWeight: 'bold',
// borderColor: 'myGray.900',
// backgroundColor: 'myWhite.600 !important'
// }
// : {
// color: 'myGray.500',
// borderColor: 'myGray.200',
// backgroundColor: 'transparent'
// })}
>
<MyIcon
name={item.icon as any}
Expand Down Expand Up @@ -317,6 +306,12 @@ const Form = ({
value={getValues('replicas')}
min={1}
max={20}
step={
getValues('dbType') === DBTypeEnum.mongodb ||
getValues('dbType') === DBTypeEnum.mysql
? 2
: 1
}
setVal={(val) => {
register('replicas', {
required: t('Replicas Cannot Empty') || '',
Expand All @@ -329,7 +324,11 @@ const Form = ({
message: `${t('Max Replicas')}20`
}
});
setValue('replicas', val || 1);
const dbType = getValues('dbType');
const oddVal = val % 2 === 0 ? val + 1 : val;
const replicasValue =
dbType === DBTypeEnum.mongodb || dbType === DBTypeEnum.mysql ? oddVal : val;
setValue('replicas', isNaN(replicasValue) ? 1 : replicasValue);
}}
/>
{getValues('replicas') === 1 && (
Expand Down
24 changes: 21 additions & 3 deletions frontend/providers/dbprovider/src/utils/json2Yaml.ts
View file
Open in desktop
Expand Up @@ -111,9 +111,9 @@ export const json2CreateCluster = (data: DBEditType, backupInfo?: BackupItemType
spec: {
affinity: {
nodeLabels: {},
podAntiAffinity: 'Preferred',
podAntiAffinity: 'Required',
tenancy: 'SharedNode',
topologyKeys: []
topologyKeys: ['kubernetes.io/hostname']
},
clusterDefinitionRef: 'apecloud-mysql',
clusterVersionRef: data.dbVersion,
Expand Down Expand Up @@ -1064,6 +1064,23 @@ export const json2NetworkService = ({
weaviate: '',
milvus: ''
};
const labelMap = {
postgresql: {
'kubeblocks.io/role': 'primary'
},
mongodb: {
'kubeblocks.io/role': 'primary'
},
'apecloud-mysql': {
'kubeblocks.io/role': 'leader'
},
redis: {},
kafka: {},
qdrant: {},
nebula: {},
weaviate: {},
milvus: {}
};

const template = {
apiVersion: 'v1',
Expand All @@ -1072,7 +1089,8 @@ export const json2NetworkService = ({
name: `${dbDetail.dbName}-export`,
labels: {
'app.kubernetes.io/instance': dbDetail.dbName,
'apps.kubeblocks.io/component-name': dbDetail.dbType
'apps.kubeblocks.io/component-name': dbDetail.dbType,
...labelMap[dbDetail.dbType]
},
ownerReferences: [
{
Expand Down