diff --git a/frontend/providers/applaunchpad/src/types/app.d.ts b/frontend/providers/applaunchpad/src/types/app.d.ts index be076dd7540..6d3f2471880 100644 --- a/frontend/providers/applaunchpad/src/types/app.d.ts +++ b/frontend/providers/applaunchpad/src/types/app.d.ts @@ -96,6 +96,7 @@ export interface AppEditType { configMapList: { mountPath: string; value: string; + subPath?: string; }[]; storeList: { name: string; diff --git a/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts b/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts index c98d017411e..682105ff5f8 100644 --- a/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts +++ b/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts @@ -99,7 +99,7 @@ export const json2DeployCr = (data: AppEditType, type: 'deployment' | 'statefuls const configMapVolumeMounts = data.configMapList.map((item) => ({ name: pathToNameFormat(item.mountPath), mountPath: item.mountPath, - subPath: pathFormat(item.mountPath) + subPath: item?.subPath ? item.subPath : pathFormat(item.mountPath) })); const configMapVolumes = data.configMapList.map((item) => ({ name: pathToNameFormat(item.mountPath), // name === [development.***.volumeMounts[*].name] @@ -108,7 +108,7 @@ export const json2DeployCr = (data: AppEditType, type: 'deployment' | 'statefuls items: [ { key: pathToNameFormat(item.mountPath), - path: pathFormat(item.mountPath) // path ===[development.***.volumeMounts[*].subPath] + path: item?.subPath ? item.subPath : pathFormat(item.mountPath) // path ===[development.***.volumeMounts[*].subPath] } ] } diff --git a/frontend/providers/cronjob/.env.template b/frontend/providers/cronjob/.env.template index b5dca822be4..c8600c53790 100644 --- a/frontend/providers/cronjob/.env.template +++ b/frontend/providers/cronjob/.env.template @@ -1,6 +1,3 @@ NEXT_PUBLIC_MOCK_USER= SEALOS_DOMAIN="cloud.sealos.io" -FASTGPT_KEY= -STORAGE_CLASSNAME=choosable -MONITOR_URL="" APPLAUNCHPAD_URL="" \ No newline at end of file diff --git a/frontend/providers/dbprovider/deploy/Kubefile b/frontend/providers/dbprovider/deploy/Kubefile index d55a797427f..ffb761baf08 100644 --- a/frontend/providers/dbprovider/deploy/Kubefile +++ b/frontend/providers/dbprovider/deploy/Kubefile @@ -15,6 +15,5 @@ ENV minioSecretKey="" ENV minioPort="" ENV migrateFileImage="" ENV minioBucketName="" -ENV BACKUP_ENABLED="false" CMD ["kubectl apply -f manifests"] diff --git a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl index 8e723798d67..8f89ad18bb6 100644 --- a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl @@ -44,6 +44,8 @@ spec: value: "{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}" - name: MONITOR_URL value: {{ .monitorUrl }} + - name: MINIO_URL + value: {{ .minioUrl }} - name: MINIO_ACCESS_KEY value: {{ .minioAccessKey }} - name: MINIO_SECRET_KEY @@ -51,9 +53,11 @@ spec: - name: MIGRATE_FILE_IMAGE value: {{ .migrateFileImage }} - name: MINIO_PORT - value: {{ .minioPort }} + value: '{{ .minioPort }}' - name: MINIO_BUCKET_NAME value: {{ .minioBucketName }} + - name: BACKUP_ENABLED + value: "false" securityContext: runAsNonRoot: true runAsUser: 1001 diff --git a/frontend/providers/dbprovider/src/utils/json2Yaml.ts b/frontend/providers/dbprovider/src/utils/json2Yaml.ts index 28df56496bf..46563112eee 100644 --- a/frontend/providers/dbprovider/src/utils/json2Yaml.ts +++ b/frontend/providers/dbprovider/src/utils/json2Yaml.ts @@ -111,9 +111,9 @@ export const json2CreateCluster = (data: DBEditType, backupInfo?: BackupItemType spec: { affinity: { nodeLabels: {}, - podAntiAffinity: 'Required', + podAntiAffinity: 'Preferred', tenancy: 'SharedNode', - topologyKeys: ['kubernetes.io/hostname'] + topologyKeys: [] }, clusterDefinitionRef: 'apecloud-mysql', clusterVersionRef: data.dbVersion,