fix ops fields

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

@@ -151,7 +151,7 @@ step:
           name: isMachineValid
           type: custom
         watcher:
-          func: onMachineChange|mssqlserver|/spec/podTemplate/spec/containers
+          func: onMachineChange|mssqlserver
           paths:
           - temp/properties/machine
       - elements:
@@ -217,44 +217,12 @@ step:
           label: Memory
           schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
           type: input
-          watcher:
-            func: onExporterResourceChange|memory
-            paths:
-            - schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
         showLabels: true
         type: horizontal-layout
       hideBlock: true
       label: Exporter
       showLabels: true
       type: block-layout
-    - elements:
-      - init:
-          type: func
-          value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/requests/cpu|/spec/verticalScaling/coordinator/resources/requests/cpu
-        label: CPU Requests
-        schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/requests/cpu
-        type: input
-      - init:
-          type: func
-          value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/limits/cpu|/spec/verticalScaling/coordinator/resources/limits/cpu
-        label: CPU Limits
-        schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/limits/cpu
-        type: input
-      - init:
-          type: func
-          value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/requests/memory|/spec/verticalScaling/coordinator/resources/requests/memory
-        label: Memory Requests
-        schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/requests/memory
-        type: input
-      - init:
-          type: func
-          value: setValueFromDbDetails|/spec/coordinator/podTemplate/spec/resources/limits/memory|/spec/verticalScaling/coordinator/resources/limits/memory
-        label: Memory Limits
-        schema: schema/properties/spec/properties/verticalScaling/properties/coordinator/properties/resources/properties/limits/memory
-        type: input
-      label: Coordinator
-      showLabels: true
-      type: horizontal-layout
     if:
       name: ifRequestTypeEqualsTo|VerticalScaling
       type: function

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

@@ -412,9 +412,9 @@ export const useFunc = (model) => {
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
     const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
-
+    const version = storeGet('/route/params/version')
     if (namespace && name) {
-      const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mssqlservers/${name}`
+      const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/${version}/namespaces/${namespace}/mssqlservers/${name}`
       const resp = await axios.get(url)
 
       setDiscriminatorValue('/dbDetails', resp.data || {})
@@ -749,10 +749,7 @@ export const useFunc = (model) => {
   // machine profile stuffs
   function getMachines() {
     const presets = storeGet('/kubedbuiPresets') || {}
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const mssqlContainer = containers.find((c) => c.name === 'mssql')
-    const limits = mssqlContainer?.resources?.requests || {}
+    const limits = getLimits()
 
     const avlMachines = presets.admin?.machineProfiles?.available || []
     let arr = []
@@ -802,9 +799,7 @@ export const useFunc = (model) => {
 
   function setMachine() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const mssqlContainer = containers.find((c) => c.name === 'mssql')
-    const limits = mssqlContainer?.resources?.requests || {}
+    const limits = getLimits()
     const annotations = dbDetails?.metadata?.annotations || {}
     const instance = annotations['kubernetes.io/instance-type']
 
@@ -828,9 +823,8 @@ export const useFunc = (model) => {
     } else return { machine: 'custom', cpu: limits.cpu, memory: limits.memory }
   }
 
-  function onMachineChange(type, valPath) {
-    let selectedMachine = {}
-    selectedMachine = getValue(discriminator, '/machine')
+  function onMachineChange(type) {
+    const selectedMachine = getValue(discriminator, '/machine') || {}
     const machine = machinesFromPreset.find((item) => item.id === selectedMachine.machine)
 
     let obj = {}
@@ -1741,24 +1735,24 @@ export const useFunc = (model) => {
     return limitVal
   }
 
-  function onExporterResourceChange(type) {
-    const commitPath = `/spec/verticalScaling/exporter/resources/requests/${type}`
-    const valPath = `/spec/verticalScaling/exporter/resources/limits/${type}`
-    const val = getValue(model, valPath)
-    if (val)
-      commit('wizard/model$update', {
-        path: commitPath,
-        value: val,
-        force: true,
-      })
-  }
-
-  function isMachineValid() {
+  function getLimits() {
     const dbDetails = getValue(discriminator, '/dbDetails')
+    let limits = {}
     const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const mssqlContainer = containers.find((c) => c.name === 'mssql')
-    const limits = mssqlContainer?.resources?.requests || {}
+    if (containers.length === 0)
+      limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    else {
+      const kind = 'mssql'
+      const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
+      limits = resource[0]?.resources?.requests || {}
+    }
 
+    return limits
+  }
+
+  function isMachineValid() {
+    const limits = getLimits()
+    console.log('limits', limits)
     const selectedMachine = getValue(discriminator, '/machine')
     const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }
 
@@ -1772,7 +1766,6 @@ export const useFunc = (model) => {
     isMachineValid,
     isRancherManaged,
     setExporter,
-    onExporterResourceChange,
     setResource,
     fetchJsons,
     returnFalse,

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

@@ -157,7 +157,7 @@ step:
           name: isMachineValid
           type: custom
         watcher:
-          func: onMachineChange|mysql|/spec/podTemplate/spec/resources
+          func: onMachineChange|mysql
           paths:
           - temp/properties/machine
       - elements:
@@ -221,10 +221,6 @@ step:
             label: Memory
             schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
             type: input
-            watcher:
-              func: onExporterResourceChange|memory
-              paths:
-              - schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory
           showLabels: true
           type: horizontal-layout
         hideBlock: true

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

@@ -421,9 +421,9 @@ export const useFunc = (model) => {
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
     const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
-
+    const version = storeGet('/route/params/version')
     if (namespace && name) {
-      const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mysqls/${name}`
+      const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/${version}/namespaces/${namespace}/mysqls/${name}`
       const resp = await axios.get(url)
 
       setDiscriminatorValue('/dbDetails', resp.data || {})
@@ -781,8 +781,7 @@ export const useFunc = (model) => {
 
   function getMachines() {
     const presets = storeGet('/kubedbuiPresets') || {}
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    const limits = getLimits()
 
     const avlMachines = presets.admin?.machineProfiles?.available || []
     let arr = []
@@ -831,9 +830,8 @@ export const useFunc = (model) => {
   }
 
   function setMachine() {
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
-    const annotations = dbDetails?.metadata?.annotations || {}
+    const limits = getLimits()
+    const annotations = getValue(discriminator, '/dbDetails/metadata/annotations') || {}
     const instance = annotations['kubernetes.io/instance-type']
 
     let parsedInstance = {}
@@ -856,9 +854,8 @@ export const useFunc = (model) => {
     } else return { machine: 'custom', cpu: limits.cpu, memory: limits.memory }
   }
 
-  function onMachineChange(type, valPath) {
-    let selectedMachine = {}
-    selectedMachine = getValue(discriminator, '/machine')
+  function onMachineChange(type) {
+    const selectedMachine = getValue(discriminator, '/machine') || {}
     const machine = machinesFromPreset.find((item) => item.id === selectedMachine.machine)
 
     let obj = {}
@@ -1819,9 +1816,23 @@ export const useFunc = (model) => {
       })
   }
 
-  function isMachineValid() {
+  function getLimits() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    let limits = {}
+    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
+    if (containers.length === 0)
+      limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    else {
+      const kind = dbDetails?.kind
+      const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
+      limits = resource[0]?.resources?.requests || {}
+    }
+
+    return limits
+  }
+
+  function isMachineValid() {
+    const limits = getLimits()
 
     const selectedMachine = getValue(discriminator, '/machine')
     const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }

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

@@ -154,7 +154,7 @@ step:
           name: isMachineValid
           type: custom
         watcher:
-          func: onMachineChange|neo4j|/spec/podTemplate/spec/resources
+          func: onMachineChange|neo4j
           paths:
           - temp/properties/machine
       - elements:

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

@@ -421,9 +421,9 @@ export const useFunc = (model) => {
     const cluster = storeGet('/route/params/cluster')
     const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace')
     const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
-
+    const version = storeGet('/route/params/version')
     if (namespace && name) {
-      const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/neo4js/${name}`
+      const url = `/clusters/${owner}/${cluster}/proxy/kubedb.com/${version}/namespaces/${namespace}/neo4js/${name}`
       const resp = await axios.get(url)
 
       setDiscriminatorValue('/dbDetails', resp.data || {})
@@ -778,8 +778,7 @@ export const useFunc = (model) => {
 
   function getMachines() {
     const presets = storeGet('/kubedbuiPresets') || {}
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    const limits = getLimits()
 
     const avlMachines = presets.admin?.machineProfiles?.available || []
     let arr = []
@@ -829,10 +828,7 @@ export const useFunc = (model) => {
 
   function setMachine() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const neo4jContainer = containers.find((c) => c.name === 'neo4j')
-    const limits = neo4jContainer?.resources?.requests || {}
+    const limits = getLimits()
     const annotations = dbDetails?.metadata?.annotations || {}
     const instance = annotations['kubernetes.io/instance-type']
 
@@ -855,9 +851,8 @@ export const useFunc = (model) => {
     } else return { machine: 'custom', cpu: limits.cpu, memory: limits.memory }
   }
 
-  function onMachineChange(type, valPath) {
-    let selectedMachine = {}
-    selectedMachine = getValue(discriminator, '/machine')
+  function onMachineChange(type) {
+    const selectedMachine = getValue(discriminator, '/machine') || {}
     const machine = machinesFromPreset.find((item) => item.id === selectedMachine.machine)
 
     let obj = {}
@@ -1793,36 +1788,8 @@ export const useFunc = (model) => {
     return data || 'No Data Found'
   }
 
-  function setExporter(type) {
-    let path = `/dbDetails/spec/monitor/prometheus/exporter/resources/limits/${type}`
-    const limitVal = getValue(discriminator, path)
-
-    if (!limitVal) {
-      path = `/dbDetails/spec/monitor/prometheus/exporter/resources/requests/${type}`
-      const reqVal = getValue(discriminator, path)
-
-      if (reqVal) return reqVal
-    }
-    return limitVal
-  }
-
-  function onExporterResourceChange(type) {
-    const commitPath = `/spec/verticalScaling/exporter/resources/requests/${type}`
-    const valPath = `/spec/verticalScaling/exporter/resources/limits/${type}`
-    const val = getValue(model, valPath)
-    if (val)
-      commit('wizard/model$update', {
-        path: commitPath,
-        value: val,
-        force: true,
-      })
-  }
-
   function isMachineValid() {
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const neo4jContainer = containers.find((c) => c.name === 'neo4j')
-    const limits = neo4jContainer?.resources?.requests || {}
+    const limits = getLimits()
 
     const selectedMachine = getValue(discriminator, '/machine')
     const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }
@@ -1833,10 +1800,23 @@ export const useFunc = (model) => {
     return false
   }
 
+  function getLimits() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    let limits = {}
+    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
+    if (containers.length === 0)
+      limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    else {
+      const kind = dbDetails?.kind
+      const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
+      limits = resource[0]?.resources?.requests || {}
+    }
+
+    return limits
+  }
+
   return {
     isMachineValid,
-    setExporter,
-    onExporterResourceChange,
     fetchAliasOptions,
     validateNewCertificates,
     disableAlias,