diff --git a/charts/kubedbcom-pgpool-editor-options/ui/create-ui.yaml b/charts/kubedbcom-pgpool-editor-options/ui/create-ui.yaml index 5a7203389a..3c0987b7ea 100644 --- a/charts/kubedbcom-pgpool-editor-options/ui/create-ui.yaml +++ b/charts/kubedbcom-pgpool-editor-options/ui/create-ui.yaml @@ -98,13 +98,13 @@ step: - loader: getAppBindings|postgres label: Select Database Reference watcher: - func: onRefChange + func: onRefChange|postgresRef paths: - - discriminator/postgresRef + - temp/properties/postgresRef refresh: true validation: type: required - schema: discriminator/postgresRef + schema: temp/properties/postgresRef type: select type: block-layout - description: Configure Credentials, Deployment Mode etc. diff --git a/charts/kubedbcom-pgpool-editor/ui/functions.js b/charts/kubedbcom-pgpool-editor/ui/functions.js index b10fb34e88..f2c869d3af 100644 --- a/charts/kubedbcom-pgpool-editor/ui/functions.js +++ b/charts/kubedbcom-pgpool-editor/ui/functions.js @@ -832,6 +832,7 @@ export const useFunc = (model) => { hasAnnotations, hasNoAnnotations, onMachineChange, + onTriggerChange, getOpsRequestUrl, isValueExistInModel, diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js index a325a21084..5742f601f0 100644 --- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js @@ -766,7 +766,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = instance || {} @@ -817,7 +817,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = instance || {} diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml index 18e580b1ce..0b7e55b998 100644 --- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml @@ -191,58 +191,30 @@ step: type: custom name: isVerticalScaleTopologyRequired schema: temp/topologyValue - - type: block-layout - label: Exporter - showLabels: true - hideBlock: true - elements: - - type: horizontal-layout - showLabels: true - elements: - - init: - type: func - value: setExporter|cpu - type: input - label: CPU - schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/properties/cpu - - type: input - init: - type: func - value: setExporter|memory - label: Memory - schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory - watcher: - func: onExporterResourceChange|memory - paths: - - schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory - - type: horizontal-layout - showLabels: true + - type: block-layout label: Exporter + showLabels: true + hideBlock: true elements: - - type: input - label: CPU Requests - schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/cpu - init: - type: func - value: setValueFromDbDetails|/spec/monitor/prometheus/exporter/resources/requests/cpu|/spec/verticalScaling/exporter/resources/requests/cpu - - type: input - label: CPU Limits - schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/cpu - init: - type: func - value: setValueFromDbDetails|/spec/monitor/prometheus/exporter/resources/limits/cpu|/spec/verticalScaling/exporter/resources/limits/cpu - - type: input - label: Memory Requests - schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/memory - init: - type: func - value: setValueFromDbDetails|/spec/monitor/prometheus/exporter/resources/requests/memory|/spec/verticalScaling/exporter/resources/requests/memory - - type: input - label: Memory Limits - schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/memory - init: - type: func - value: setValueFromDbDetails|/spec/monitor/prometheus/exporter/resources/limits/memory|/spec/verticalScaling/exporter/resources/limits/memory + - type: horizontal-layout + showLabels: true + elements: + - init: + type: func + value: setExporter|cpu + type: input + label: CPU + schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/properties/cpu + - type: input + init: + type: func + value: setExporter|memory + label: Memory + schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory + watcher: + func: onExporterResourceChange|memory + paths: + - schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory - type: horizontal-layout showLabels: true label: Coordinator diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js index 241009495c..c856354745 100644 --- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js @@ -765,7 +765,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = {} @@ -1144,7 +1144,6 @@ export const useFunc = (model) => { // direct model update required for reusable element. // computed property is not applicable for reusable element - console.log('Setting value from dbDetails:', commitPath, retValue) commit('wizard/model$update', { path: commitPath, value: retValue, diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js index ea7c139ee3..9f59f7cc6d 100644 --- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js @@ -760,7 +760,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = {} @@ -811,7 +811,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = {} diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml index ae87f4a54f..663aba85af 100644 --- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml @@ -34,7 +34,7 @@ step: label: Database Ref if: type: function - name: showAnd InitDatabaseRef + name: showAndInitDatabaseRef loader: name: getDbs watchPaths: diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js index 3147f03057..378f894b80 100644 --- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js @@ -769,7 +769,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = {} @@ -820,7 +820,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let parsedInstance = {} try { - if (instance) parsedInstance = JSON.parse(instance) + if (instance) parsedInstance = instance } catch (e) { console.log(e) parsedInstance = {} diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js index a73dcb3f50..f8a1d8f938 100644 --- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js @@ -768,7 +768,7 @@ export const useFunc = (model) => { const instance = annotations['kubernetes.io/instance-type'] let machine = 'custom' try { - if (instance) machine = JSON.parse(instance) || 'custom' + if (instance) machine = instance || 'custom' } catch (e) { console.log(e) machine = 'custom'