Skip to content

Commit eb2b99f

Browse files
SamiulSouravShofiqur-052
SamiulSourav
authored and
Shofiqur-052
committed
fix ops fields (#1077)
Signed-off-by: shofiq <shofiq@appscode.com>
1 parent f2438e3 commit eb2b99f

32 files changed

Lines changed: 368 additions & 806 deletions

File tree

‎charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ step:
151151
name: isMachineValid
152152
type: custom
153153
watcher:
154-
func: onMachineChange|mssqlserver|/spec/podTemplate/spec/containers
154+
func: onMachineChange|mssqlserver
155155
paths:
156156
- temp/properties/machine
157157
- elements:
@@ -217,44 +217,12 @@ step:
217217
label: Memory
218218
schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
219219
type: input
220-
watcher:
221-
func: onExporterResourceChange|memory
222-
paths:
223-
- schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
224220
showLabels: true
225221
type: horizontal-layout
226222
hideBlock: true
227223
label: Exporter
228224
showLabels: true
229225
type: block-layout
230-
- elements:
231-
- init:
232-
type: func
233-
value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/requests/cpu|/spec/verticalScaling/coordinator/resources/requests/cpu
234-
label: CPU Requests
235-
schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/requests/cpu
236-
type: input
237-
- init:
238-
type: func
239-
value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/limits/cpu|/spec/verticalScaling/coordinator/resources/limits/cpu
240-
label: CPU Limits
241-
schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/limits/cpu
242-
type: input
243-
- init:
244-
type: func
245-
value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/requests/memory|/spec/verticalScaling/coordinator/resources/requests/memory
246-
label: Memory Requests
247-
schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/requests/memory
248-
type: input
249-
- init:
250-
type: func
251-
value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/limits/memory|/spec/verticalScaling/coordinator/resources/limits/memory
252-
label: Memory Limits
253-
schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/limits/memory
254-
type: input
255-
label: Coordinator
256-
showLabels: true
257-
type: horizontal-layout
258226
if:
259227
name: ifRequestTypeEqualsTo|VerticalScaling
260228
type: function

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

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,9 @@ export const useFunc = (model) => {
412412
const cluster = storeGet('/route/params/cluster')
413413
const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
414414
const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
415-
415+
const version = storeGet('/route/params/version')
416416
if (namespace && name) {
417-
const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mssqlservers/${name}`
417+
const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/${version}/namespaces/${namespace}/mssqlservers/${name}`
418418
const resp = await axios.get(url)
419419

420420
setDiscriminatorValue('/dbDetails', resp.data || {})
@@ -749,10 +749,7 @@ export const useFunc = (model) => {
749749
// machine profile stuffs
750750
function getMachines() {
751751
const presets = storeGet('/kubedbuiPresets') || {}
752-
const dbDetails = getValue(discriminator, '/dbDetails')
753-
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
754-
const mssqlContainer = containers.find((c) => c.name === 'mssql')
755-
const limits = mssqlContainer?.resources?.requests || {}
752+
const limits = getLimits()
756753

757754
const avlMachines = presets.admin?.machineProfiles?.available || []
758755
let arr = []
@@ -802,9 +799,7 @@ export const useFunc = (model) => {
802799

803800
function setMachine() {
804801
const dbDetails = getValue(discriminator, '/dbDetails')
805-
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
806-
const mssqlContainer = containers.find((c) => c.name === 'mssql')
807-
const limits = mssqlContainer?.resources?.requests || {}
802+
const limits = getLimits()
808803
const annotations = dbDetails?.metadata?.annotations || {}
809804
const instance = annotations['kubernetes.io/instance-type']
810805

@@ -828,9 +823,8 @@ export const useFunc = (model) => {
828823
} else return { machine: 'custom', cpu: limits.cpu, memory: limits.memory }
829824
}
830825

831-
function onMachineChange(type, valPath) {
832-
let selectedMachine = {}
833-
selectedMachine = getValue(discriminator, '/machine')
826+
function onMachineChange(type) {
827+
const selectedMachine = getValue(discriminator, '/machine') || {}
834828
const machine = machinesFromPreset.find((item) => item.id === selectedMachine.machine)
835829

836830
let obj = {}
@@ -1741,24 +1735,24 @@ export const useFunc = (model) => {
17411735
return limitVal
17421736
}
17431737

1744-
function onExporterResourceChange(type) {
1745-
const commitPath = `/spec/verticalScaling/exporter/resources/requests/${type}`
1746-
const valPath = `/spec/verticalScaling/exporter/resources/limits/${type}`
1747-
const val = getValue(model, valPath)
1748-
if (val)
1749-
commit('wizard/model$update', {
1750-
path: commitPath,
1751-
value: val,
1752-
force: true,
1753-
})
1754-
}
1755-
1756-
function isMachineValid() {
1738+
function getLimits() {
17571739
const dbDetails = getValue(discriminator, '/dbDetails')
1740+
let limits = {}
17581741
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
1759-
const mssqlContainer = containers.find((c) => c.name === 'mssql')
1760-
const limits = mssqlContainer?.resources?.requests || {}
1742+
if (containers.length === 0)
1743+
limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
1744+
else {
1745+
const kind = 'mssql'
1746+
const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
1747+
limits = resource[0]?.resources?.requests || {}
1748+
}
17611749

1750+
return limits
1751+
}
1752+
1753+
function isMachineValid() {
1754+
const limits = getLimits()
1755+
console.log('limits', limits)
17621756
const selectedMachine = getValue(discriminator, '/machine')
17631757
const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }
17641758

@@ -1772,7 +1766,6 @@ export const useFunc = (model) => {
17721766
isMachineValid,
17731767
isRancherManaged,
17741768
setExporter,
1775-
onExporterResourceChange,
17761769
setResource,
17771770
fetchJsons,
17781771
returnFalse,

‎charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ step:
157157
name: isMachineValid
158158
type: custom
159159
watcher:
160-
func: onMachineChange|mysql|/spec/podTemplate/spec/resources
160+
func: onMachineChange|mysql
161161
paths:
162162
- temp/properties/machine
163163
- elements:
@@ -221,10 +221,6 @@ step:
221221
label: Memory
222222
schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
223223
type: input
224-
watcher:
225-
func: onExporterResourceChange|memory
226-
paths:
227-
- schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
228224
showLabels: true
229225
type: horizontal-layout
230226
hideBlock: true

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

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ export const useFunc = (model) => {
421421
const cluster = storeGet('/route/params/cluster')
422422
const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
423423
const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
424-
424+
const version = storeGet('/route/params/version')
425425
if (namespace && name) {
426-
const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mysqls/${name}`
426+
const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/${version}/namespaces/${namespace}/mysqls/${name}`
427427
const resp = await axios.get(url)
428428

429429
setDiscriminatorValue('/dbDetails', resp.data || {})
@@ -781,8 +781,7 @@ export const useFunc = (model) => {
781781

782782
function getMachines() {
783783
const presets = storeGet('/kubedbuiPresets') || {}
784-
const dbDetails = getValue(discriminator, '/dbDetails')
785-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
784+
const limits = getLimits()
786785

787786
const avlMachines = presets.admin?.machineProfiles?.available || []
788787
let arr = []
@@ -831,9 +830,8 @@ export const useFunc = (model) => {
831830
}
832831

833832
function setMachine() {
834-
const dbDetails = getValue(discriminator, '/dbDetails')
835-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
836-
const annotations = dbDetails?.metadata?.annotations || {}
833+
const limits = getLimits()
834+
const annotations = getValue(discriminator, '/dbDetails/metadata/annotations') || {}
837835
const instance = annotations['kubernetes.io/instance-type']
838836

839837
let parsedInstance = {}
@@ -856,9 +854,8 @@ export const useFunc = (model) => {
856854
} else return { machine: 'custom', cpu: limits.cpu, memory: limits.memory }
857855
}
858856

859-
function onMachineChange(type, valPath) {
860-
let selectedMachine = {}
861-
selectedMachine = getValue(discriminator, '/machine')
857+
function onMachineChange(type) {
858+
const selectedMachine = getValue(discriminator, '/machine') || {}
862859
const machine = machinesFromPreset.find((item) => item.id === selectedMachine.machine)
863860

864861
let obj = {}
@@ -1819,9 +1816,23 @@ export const useFunc = (model) => {
18191816
})
18201817
}
18211818

1822-
function isMachineValid() {
1819+
function getLimits() {
18231820
const dbDetails = getValue(discriminator, '/dbDetails')
1824-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
1821+
let limits = {}
1822+
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
1823+
if (containers.length === 0)
1824+
limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
1825+
else {
1826+
const kind = dbDetails?.kind
1827+
const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
1828+
limits = resource[0]?.resources?.requests || {}
1829+
}
1830+
1831+
return limits
1832+
}
1833+
1834+
function isMachineValid() {
1835+
const limits = getLimits()
18251836

18261837
const selectedMachine = getValue(discriminator, '/machine')
18271838
const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }

‎charts/opskubedbcom-neo4jopsrequest-editor/ui/create-ui.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ step:
154154
name: isMachineValid
155155
type: custom
156156
watcher:
157-
func: onMachineChange|neo4j|/spec/podTemplate/spec/resources
157+
func: onMachineChange|neo4j
158158
paths:
159159
- temp/properties/machine
160160
- elements:

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

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ export const useFunc = (model) => {
421421
const cluster = storeGet('/route/params/cluster')
422422
const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
423423
const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
424-
424+
const version = storeGet('/route/params/version')
425425
if (namespace && name) {
426-
const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/neo4js/${name}`
426+
const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/${version}/namespaces/${namespace}/neo4js/${name}`
427427
const resp = await axios.get(url)
428428

429429
setDiscriminatorValue('/dbDetails', resp.data || {})
@@ -778,8 +778,7 @@ export const useFunc = (model) => {
778778

779779
function getMachines() {
780780
const presets = storeGet('/kubedbuiPresets') || {}
781-
const dbDetails = getValue(discriminator, '/dbDetails')
782-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
781+
const limits = getLimits()
783782

784783
const avlMachines = presets.admin?.machineProfiles?.available || []
785784
let arr = []
@@ -829,10 +828,7 @@ export const useFunc = (model) => {
829828

830829
function setMachine() {
831830
const dbDetails = getValue(discriminator, '/dbDetails')
832-
833-
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
834-
const neo4jContainer = containers.find((c) => c.name === 'neo4j')
835-
const limits = neo4jContainer?.resources?.requests || {}
831+
const limits = getLimits()
836832
const annotations = dbDetails?.metadata?.annotations || {}
837833
const instance = annotations['kubernetes.io/instance-type']
838834

@@ -855,9 +851,8 @@ export const useFunc = (model) => {
855851
} else return { machine: 'custom', cpu: limits.cpu, memory: limits.memory }
856852
}
857853

858-
function onMachineChange(type, valPath) {
859-
let selectedMachine = {}
860-
selectedMachine = getValue(discriminator, '/machine')
854+
function onMachineChange(type) {
855+
const selectedMachine = getValue(discriminator, '/machine') || {}
861856
const machine = machinesFromPreset.find((item) => item.id === selectedMachine.machine)
862857

863858
let obj = {}
@@ -1793,36 +1788,8 @@ export const useFunc = (model) => {
17931788
return data || 'No Data Found'
17941789
}
17951790

1796-
function setExporter(type) {
1797-
let path = `/dbDetails/spec/monitor/prometheus/exporter/resources/limits/${type}`
1798-
const limitVal = getValue(discriminator, path)
1799-
1800-
if (!limitVal) {
1801-
path = `/dbDetails/spec/monitor/prometheus/exporter/resources/requests/${type}`
1802-
const reqVal = getValue(discriminator, path)
1803-
1804-
if (reqVal) return reqVal
1805-
}
1806-
return limitVal
1807-
}
1808-
1809-
function onExporterResourceChange(type) {
1810-
const commitPath = `/spec/verticalScaling/exporter/resources/requests/${type}`
1811-
const valPath = `/spec/verticalScaling/exporter/resources/limits/${type}`
1812-
const val = getValue(model, valPath)
1813-
if (val)
1814-
commit('wizard/model$update', {
1815-
path: commitPath,
1816-
value: val,
1817-
force: true,
1818-
})
1819-
}
1820-
18211791
function isMachineValid() {
1822-
const dbDetails = getValue(discriminator, '/dbDetails')
1823-
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
1824-
const neo4jContainer = containers.find((c) => c.name === 'neo4j')
1825-
const limits = neo4jContainer?.resources?.requests || {}
1792+
const limits = getLimits()
18261793

18271794
const selectedMachine = getValue(discriminator, '/machine')
18281795
const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }
@@ -1833,10 +1800,23 @@ export const useFunc = (model) => {
18331800
return false
18341801
}
18351802

1803+
function getLimits() {
1804+
const dbDetails = getValue(discriminator, '/dbDetails')
1805+
let limits = {}
1806+
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
1807+
if (containers.length === 0)
1808+
limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
1809+
else {
1810+
const kind = dbDetails?.kind
1811+
const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
1812+
limits = resource[0]?.resources?.requests || {}
1813+
}
1814+
1815+
return limits
1816+
}
1817+
18361818
return {
18371819
isMachineValid,
1838-
setExporter,
1839-
onExporterResourceChange,
18401820
fetchAliasOptions,
18411821
validateNewCertificates,
18421822
disableAlias,

0 commit comments

Comments
 (0)