Skip to content

Commit 32b72b5

Browse files
SamiulSouravSamiulSourav
committed
fix vertical machine init (#964)
Signed-off-by: Samiul <[email protected]>
1 parent db15cf9 commit 32b72b5

File tree

12 files changed

+141
-45
lines changed

12 files changed

+141
-45
lines changed

‎charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,12 @@ export const useFunc = (model) => {
355355

356356
function isTlsEnabled() {
357357
const dbDetails = getValue(discriminator, '/dbDetails')
358-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
358+
return (
359+
(dbDetails?.spec?.sslMode &&
360+
dbDetails?.spec?.sslMode !== 'disabled' &&
361+
dbDetails?.spec?.sslMode !== 'disable') ||
362+
dbDetails?.spec?.tls
363+
)
359364
}
360365

361366
function isRancherManaged() {
@@ -751,7 +756,8 @@ export const useFunc = (model) => {
751756
memory: machineData.limits.memory,
752757
},
753758
}
754-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
759+
} else
760+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
755761
}
756762
})
757763
} else {
@@ -780,7 +786,17 @@ export const useFunc = (model) => {
780786
const dbDetails = getValue(discriminator, '/dbDetails')
781787
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
782788
const annotations = dbDetails?.metadata?.annotations || {}
783-
const machine = annotations['kubernetes.io/instance-type'] || 'custom'
789+
const instance = annotations['kubernetes.io/instance-type']
790+
791+
let parsedInstance = {}
792+
try {
793+
if (instance) parsedInstance = JSON.parse(instance)
794+
} catch (e) {
795+
console.log(e)
796+
parsedInstance = instance || {}
797+
}
798+
799+
const machine = parsedInstance || 'custom'
784800

785801
const machinePresets = machinesFromPreset.find((item) => item.id === machine)
786802
if (machinePresets) {

‎charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,8 @@ export const useFunc = (model) => {
745745
} else {
746746
arr = machineList
747747
.map((machine) => {
748-
if (machine === 'custom') return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
748+
if (machine === 'custom')
749+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
749750
const subtext = `CPU: ${machines[machine].resources.limits.cpu}, Memory: ${machines[machine].resources.limits.memory}`
750751
const text = machine
751752
return {
@@ -770,7 +771,7 @@ export const useFunc = (model) => {
770771
const instance = annotations['kubernetes.io/instance-type']
771772
let parsedInstance = {}
772773
try {
773-
if (instance) parsedInstance = instance
774+
if (instance) parsedInstance = JSON.parse(instance)
774775
} catch (e) {
775776
console.log(e)
776777
parsedInstance = instance || {}

‎charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,16 @@ export const useFunc = (model) => {
364364
return true
365365
}
366366

367-
function isTlsEnabled() {
367+
function isTlsEnabled() {
368368
const dbDetails = getValue(discriminator, '/dbDetails')
369-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
369+
return (
370+
(dbDetails?.spec?.sslMode &&
371+
dbDetails?.spec?.sslMode !== 'disabled' &&
372+
dbDetails?.spec?.sslMode !== 'disable') ||
373+
dbDetails?.spec?.tls
374+
)
370375
}
371-
376+
372377
function isRancherManaged() {
373378
const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers')
374379
const found = managers.find((item) => item === 'Rancher')
@@ -793,7 +798,8 @@ export const useFunc = (model) => {
793798
memory: machineData.limits.memory,
794799
},
795800
}
796-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
801+
} else
802+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
797803
}
798804
})
799805
} else {
@@ -834,7 +840,7 @@ export const useFunc = (model) => {
834840
if (instance) parsedInstance = JSON.parse(instance)
835841
} catch (e) {
836842
console.log(e)
837-
parsedInstance = {}
843+
parsedInstance = instance || {}
838844
}
839845
const machine = parsedInstance[type] || 'custom'
840846

@@ -1583,10 +1589,6 @@ export const useFunc = (model) => {
15831589

15841590
function setValueFromDbDetails(path, commitPath) {
15851591
const retValue = getValue(discriminator, `/dbDetails${path}`)
1586-
console.log(getValue(discriminator, '/dbDetails'))
1587-
1588-
console.log(path)
1589-
15901592
if (commitPath) {
15911593
const tlsOperation = getValue(discriminator, '/tlsOperation')
15921594
// computed called when tls fields is not visible

‎charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,8 @@ export const useFunc = (model) => {
735735
memory: machineData.limits.memory,
736736
},
737737
}
738-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
738+
} else
739+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
739740
}
740741
})
741742
} else {
@@ -767,13 +768,15 @@ export const useFunc = (model) => {
767768
const limits = mssqlContainer?.resources?.requests || {}
768769
const annotations = dbDetails?.metadata?.annotations || {}
769770
const instance = annotations['kubernetes.io/instance-type']
771+
770772
let parsedInstance = {}
771773
try {
772-
if (instance) parsedInstance = instance
774+
if (instance) parsedInstance = JSON.parse(instance)
773775
} catch (e) {
774776
console.log(e)
775-
parsedInstance = {}
777+
parsedInstance = instance || {}
776778
}
779+
777780
const machine = parsedInstance || 'custom'
778781

779782
const machinePresets = machinesFromPreset.find((item) => item.id === machine)

‎charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,12 @@ export const useFunc = (model) => {
355355

356356
function isTlsEnabled() {
357357
const dbDetails = getValue(discriminator, '/dbDetails')
358-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
358+
return (
359+
(dbDetails?.spec?.sslMode &&
360+
dbDetails?.spec?.sslMode !== 'disabled' &&
361+
dbDetails?.spec?.sslMode !== 'disable') ||
362+
dbDetails?.spec?.tls
363+
)
359364
}
360365

361366
function isRancherManaged() {
@@ -760,7 +765,8 @@ export const useFunc = (model) => {
760765
memory: machineData.limits.memory,
761766
},
762767
}
763-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
768+
} else
769+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
764770
}
765771
})
766772
} else {
@@ -789,7 +795,17 @@ export const useFunc = (model) => {
789795
const dbDetails = getValue(discriminator, '/dbDetails')
790796
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
791797
const annotations = dbDetails?.metadata?.annotations || {}
792-
const machine = annotations['kubernetes.io/instance-type'] || 'custom'
798+
const instance = annotations['kubernetes.io/instance-type']
799+
800+
let parsedInstance = {}
801+
try {
802+
if (instance) parsedInstance = JSON.parse(instance)
803+
} catch (e) {
804+
console.log(e)
805+
parsedInstance = instance || {}
806+
}
807+
808+
const machine = parsedInstance || 'custom'
793809

794810
const machinePresets = machinesFromPreset.find((item) => item.id === machine)
795811
if (machinePresets) {

‎charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,12 @@ export const useFunc = (model) => {
356356

357357
function isTlsEnabled() {
358358
const dbDetails = getValue(discriminator, '/dbDetails')
359-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
359+
return (
360+
(dbDetails?.spec?.sslMode &&
361+
dbDetails?.spec?.sslMode !== 'disabled' &&
362+
dbDetails?.spec?.sslMode !== 'disable') ||
363+
dbDetails?.spec?.tls
364+
)
360365
}
361366

362367
function isRancherManaged() {
@@ -737,7 +742,8 @@ export const useFunc = (model) => {
737742
memory: machineData.limits.memory,
738743
},
739744
}
740-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
745+
} else
746+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
741747
}
742748
})
743749
} else {
@@ -769,10 +775,10 @@ export const useFunc = (model) => {
769775
const instance = annotations['kubernetes.io/instance-type']
770776
let parsedInstance = {}
771777
try {
772-
if (instance) parsedInstance = instance
778+
if (instance) parsedInstance = JSON.parse(instance)
773779
} catch (e) {
774780
console.log(e)
775-
parsedInstance = {}
781+
parsedInstance = instance || {}
776782
}
777783
const machine = parsedInstance || 'custom'
778784

‎charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,8 @@ export const useFunc = (model) => {
738738
memory: machineData.limits.memory,
739739
},
740740
}
741-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
741+
} else
742+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
742743
}
743744
})
744745
} else {
@@ -768,15 +769,17 @@ export const useFunc = (model) => {
768769
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
769770
const annotations = dbDetails?.metadata?.annotations || {}
770771
const instance = annotations['kubernetes.io/instance-type']
771-
let machine = 'custom'
772772

773+
let parsedInstance = {}
773774
try {
774-
if (instance) machine = instance
775+
if (instance) parsedInstance = JSON.parse(instance)
775776
} catch (e) {
776777
console.log(e)
777-
machine = 'custom'
778+
parsedInstance = instance || {}
778779
}
779780

781+
const machine = parsedInstance || 'custom'
782+
780783
const machinePresets = machinesFromPreset.find((item) => item.id === machine)
781784
if (machinePresets) {
782785
return {

‎charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,12 @@ export const useFunc = (model) => {
357357

358358
function isTlsEnabled() {
359359
const dbDetails = getValue(discriminator, '/dbDetails')
360-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
360+
return (
361+
(dbDetails?.spec?.sslMode &&
362+
dbDetails?.spec?.sslMode !== 'disabled' &&
363+
dbDetails?.spec?.sslMode !== 'disable') ||
364+
dbDetails?.spec?.tls
365+
)
361366
}
362367

363368
function isRancherManaged() {
@@ -743,7 +748,8 @@ export const useFunc = (model) => {
743748
memory: machineData.limits.memory,
744749
},
745750
}
746-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
751+
} else
752+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
747753
}
748754
})
749755
} else {
@@ -778,10 +784,10 @@ export const useFunc = (model) => {
778784
const instance = annotations['kubernetes.io/instance-type']
779785
let parsedInstance = {}
780786
try {
781-
if (instance) parsedInstance = instance
787+
if (instance) parsedInstance = JSON.parse(instance)
782788
} catch (e) {
783789
console.log(e)
784-
parsedInstance = {}
790+
parsedInstance = instance || {}
785791
}
786792
const machine = parsedInstance || 'custom'
787793

‎charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,12 @@ export const useFunc = (model) => {
355355

356356
function isTlsEnabled() {
357357
const dbDetails = getValue(discriminator, '/dbDetails')
358-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
358+
return (
359+
(dbDetails?.spec?.sslMode &&
360+
dbDetails?.spec?.sslMode !== 'disabled' &&
361+
dbDetails?.spec?.sslMode !== 'disable') ||
362+
dbDetails?.spec?.tls
363+
)
359364
}
360365

361366
function isRancherManaged() {
@@ -744,7 +749,8 @@ export const useFunc = (model) => {
744749
memory: machineData.limits.memory,
745750
},
746751
}
747-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
752+
} else
753+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
748754
}
749755
})
750756
} else {
@@ -774,12 +780,12 @@ export const useFunc = (model) => {
774780
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
775781
const annotations = dbDetails?.metadata?.annotations || {}
776782
const instance = annotations['kubernetes.io/instance-type']
777-
let machine = 'custom'
783+
let parsedInstance = {}
778784
try {
779-
if (instance) machine = instance || 'custom'
785+
if (instance) parsedInstance = JSON.parse(instance)
780786
} catch (e) {
781787
console.log(e)
782-
machine = 'custom'
788+
parsedInstance = instance || {}
783789
}
784790

785791
const machinePresets = machinesFromPreset.find((item) => item.id === machine)

‎charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,12 @@ export const useFunc = (model) => {
355355

356356
function isTlsEnabled() {
357357
const dbDetails = getValue(discriminator, '/dbDetails')
358-
return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls
358+
return (
359+
(dbDetails?.spec?.sslMode &&
360+
dbDetails?.spec?.sslMode !== 'disabled' &&
361+
dbDetails?.spec?.sslMode !== 'disable') ||
362+
dbDetails?.spec?.tls
363+
)
359364
}
360365

361366
async function getNamespaces() {
@@ -741,7 +746,8 @@ export const useFunc = (model) => {
741746
memory: machineData.limits.memory,
742747
},
743748
}
744-
} else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
749+
} else
750+
return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } }
745751
}
746752
})
747753
} else {
@@ -773,7 +779,15 @@ export const useFunc = (model) => {
773779
const resource = containers.filter((ele) => ele.name === kind.toLowerCase())
774780
const limits = resource[0]?.resources?.requests || {}
775781
const annotations = dbDetails?.metadata?.annotations || {}
776-
const machine = annotations['kubernetes.io/instance-type'] || 'custom'
782+
const instance = annotations['kubernetes.io/instance-type']
783+
let parsedInstance = {}
784+
try {
785+
if (instance) parsedInstance = JSON.parse(instance)
786+
} catch (e) {
787+
console.log(e)
788+
parsedInstance = instance || {}
789+
}
790+
const machine = parsedInstance || 'custom'
777791

778792
const machinePresets = machinesFromPreset.find((item) => item.id === machine)
779793
if (machinePresets) {

0 commit comments

Comments
 (0)