Skip to content

fix vertical machine init #964

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

Merged
SamiulSourav merged 1 commit into from
Jan 27, 2026
Merged

fix vertical machine init #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 || {}
Expand Down
20 changes: 11 additions & 9 deletions charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
22 changes: 19 additions & 3 deletions charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
14 changes: 10 additions & 4 deletions charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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'

Expand Down
11 changes: 7 additions & 4 deletions charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
14 changes: 10 additions & 4 deletions charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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'

Expand Down
16 changes: 11 additions & 5 deletions charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
20 changes: 17 additions & 3 deletions charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
Loading
Loading