diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js index c2421bdfe4..8df05164c5 100644 --- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js @@ -355,7 +355,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -751,7 +756,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -780,7 +786,17 @@ export const useFunc = (model) => { const dbDetails = getValue(discriminator, '/dbDetails') const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} - const machine = annotations['kubernetes.io/instance-type'] || 'custom' + const instance = annotations['kubernetes.io/instance-type'] + + let parsedInstance = {} + try { + if (instance) parsedInstance = JSON.parse(instance) + } catch (e) { + console.log(e) + parsedInstance = instance || {} + } + + const machine = parsedInstance || 'custom' const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js index 693fd1ab94..73a459108c 100644 --- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js @@ -745,7 +745,8 @@ export const useFunc = (model) => { } else { arr = machineList .map((machine) => { - if (machine === 'custom') return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + if (machine === 'custom') + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } const subtext = `CPU: ${machines[machine].resources.limits.cpu}, Memory: ${machines[machine].resources.limits.memory}` const text = machine return { @@ -770,7 +771,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = instance + if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) parsedInstance = instance || {} diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js index b6fbcc13c2..d90d9eb480 100644 --- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js @@ -364,11 +364,16 @@ export const useFunc = (model) => { return true } - function isTlsEnabled() { + function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } - + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -793,7 +798,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -834,7 +840,7 @@ export const useFunc = (model) => { if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) - parsedInstance = {} + parsedInstance = instance || {} } const machine = parsedInstance[type] || 'custom' @@ -1583,10 +1589,6 @@ export const useFunc = (model) => { function setValueFromDbDetails(path, commitPath) { const retValue = getValue(discriminator, `/dbDetails${path}`) - console.log(getValue(discriminator, '/dbDetails')) - - console.log(path) - if (commitPath) { const tlsOperation = getValue(discriminator, '/tlsOperation') // computed called when tls fields is not visible diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js index 652d233a56..406e2516ba 100644 --- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js @@ -735,7 +735,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -767,13 +768,15 @@ export const useFunc = (model) => { const limits = mssqlContainer?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} const instance = annotations['kubernetes.io/instance-type'] + let parsedInstance = {} try { - if (instance) parsedInstance = instance + if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) - parsedInstance = {} + parsedInstance = instance || {} } + const machine = parsedInstance || 'custom' const machinePresets = machinesFromPreset.find((item) => item.id === machine) diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js index 885c320ed7..50af2e9937 100644 --- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js @@ -355,7 +355,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -760,7 +765,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -789,7 +795,17 @@ export const useFunc = (model) => { const dbDetails = getValue(discriminator, '/dbDetails') const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} - const machine = annotations['kubernetes.io/instance-type'] || 'custom' + const instance = annotations['kubernetes.io/instance-type'] + + let parsedInstance = {} + try { + if (instance) parsedInstance = JSON.parse(instance) + } catch (e) { + console.log(e) + parsedInstance = instance || {} + } + + const machine = parsedInstance || 'custom' const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js index 24afa5feed..2242010ee5 100644 --- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js @@ -356,7 +356,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -737,7 +742,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -769,10 +775,10 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = instance + if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) - parsedInstance = {} + parsedInstance = instance || {} } const machine = parsedInstance || 'custom' diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js index 4dac4d5656..72eb432c53 100644 --- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js @@ -738,7 +738,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -768,15 +769,17 @@ export const useFunc = (model) => { const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} const instance = annotations['kubernetes.io/instance-type'] - let machine = 'custom' + let parsedInstance = {} try { - if (instance) machine = instance + if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) - machine = 'custom' + parsedInstance = instance || {} } + const machine = parsedInstance || 'custom' + const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js index 91c70ec4ed..1b33dbe666 100644 --- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js @@ -357,7 +357,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -743,7 +748,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -778,10 +784,10 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = instance + if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) - parsedInstance = {} + parsedInstance = instance || {} } const machine = parsedInstance || 'custom' diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js index 1d613966d3..ff28700e23 100644 --- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js @@ -355,7 +355,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -744,7 +749,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -774,12 +780,12 @@ export const useFunc = (model) => { const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} const instance = annotations['kubernetes.io/instance-type'] - let machine = 'custom' + let parsedInstance = {} try { - if (instance) machine = instance || 'custom' + if (instance) parsedInstance = JSON.parse(instance) } catch (e) { console.log(e) - machine = 'custom' + parsedInstance = instance || {} } const machinePresets = machinesFromPreset.find((item) => item.id === machine) diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js index 64b6e1b956..e43716f0cb 100644 --- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js @@ -355,7 +355,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } async function getNamespaces() { @@ -741,7 +746,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -773,7 +779,15 @@ export const useFunc = (model) => { const resource = containers.filter((ele) => ele.name === kind.toLowerCase()) const limits = resource[0]?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} - const machine = annotations['kubernetes.io/instance-type'] || 'custom' + const instance = annotations['kubernetes.io/instance-type'] + let parsedInstance = {} + try { + if (instance) parsedInstance = JSON.parse(instance) + } catch (e) { + console.log(e) + parsedInstance = instance || {} + } + const machine = parsedInstance || 'custom' const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js index 80db59034e..2da0031aad 100644 --- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js @@ -355,7 +355,12 @@ export const useFunc = (model) => { function isTlsEnabled() { const dbDetails = getValue(discriminator, '/dbDetails') - return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + return ( + (dbDetails?.spec?.sslMode && + dbDetails?.spec?.sslMode !== 'disabled' && + dbDetails?.spec?.sslMode !== 'disable') || + dbDetails?.spec?.tls + ) } function isRancherManaged() { @@ -746,7 +751,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -775,7 +781,15 @@ export const useFunc = (model) => { const dbDetails = getValue(discriminator, '/dbDetails') const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {} const annotations = dbDetails?.metadata?.annotations || {} - const machine = annotations['kubernetes.io/instance-type'] || 'custom' + const instance = annotations['kubernetes.io/instance-type'] + let parsedInstance = {} + try { + if (instance) parsedInstance = JSON.parse(instance) + } catch (e) { + console.log(e) + parsedInstance = instance || {} + } + const machine = parsedInstance || 'custom' const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { diff --git a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js index ad582ea245..7d868f3d44 100644 --- a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js @@ -1414,7 +1414,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -1444,7 +1445,15 @@ export const useFunc = (model) => { // const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.limits || {} const limits = dbDetails?.spec?.podTemplate?.spec?.containers?.[0]?.resources?.requests const annotations = dbDetails?.metadata?.annotations || {} - const machine = annotations['kubernetes.io/instance-type'] || 'custom' + const instance = annotations['kubernetes.io/instance-type'] + let parsedInstance = {} + try { + if (instance) parsedInstance = JSON.parse(instance) + } catch (e) { + console.log(e) + parsedInstance = instance || {} + } + const machine = parsedInstance[type] || 'custom' const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) {