diff --git a/charts/kubedbcom-clickhouse-editor/ui/functions.js b/charts/kubedbcom-clickhouse-editor/ui/functions.js index 2310b1579b..8fe7a58cfc 100644 --- a/charts/kubedbcom-clickhouse-editor/ui/functions.js +++ b/charts/kubedbcom-clickhouse-editor/ui/functions.js @@ -261,8 +261,10 @@ export const useFunc = (model) => { const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-druid-editor/ui/functions.js b/charts/kubedbcom-druid-editor/ui/functions.js index 563b60752f..8b26ad5391 100644 --- a/charts/kubedbcom-druid-editor/ui/functions.js +++ b/charts/kubedbcom-druid-editor/ui/functions.js @@ -1602,8 +1602,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-elasticsearch-editor/ui/functions.js b/charts/kubedbcom-elasticsearch-editor/ui/functions.js index 403ba28b5b..24cc1f9659 100644 --- a/charts/kubedbcom-elasticsearch-editor/ui/functions.js +++ b/charts/kubedbcom-elasticsearch-editor/ui/functions.js @@ -853,8 +853,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-ferretdb-editor/ui/functions.js b/charts/kubedbcom-ferretdb-editor/ui/functions.js index c5d4a32943..fcd4de6ae0 100644 --- a/charts/kubedbcom-ferretdb-editor/ui/functions.js +++ b/charts/kubedbcom-ferretdb-editor/ui/functions.js @@ -298,8 +298,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-kafka-editor/ui/functions.js b/charts/kubedbcom-kafka-editor/ui/functions.js index e7926b7e6d..d41e0b28f4 100644 --- a/charts/kubedbcom-kafka-editor/ui/functions.js +++ b/charts/kubedbcom-kafka-editor/ui/functions.js @@ -275,8 +275,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-mariadb-editor/ui/functions.js b/charts/kubedbcom-mariadb-editor/ui/functions.js index 22a08b75ab..e4c5202e39 100644 --- a/charts/kubedbcom-mariadb-editor/ui/functions.js +++ b/charts/kubedbcom-mariadb-editor/ui/functions.js @@ -1003,8 +1003,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-memcached-editor/ui/edit-ui.yaml b/charts/kubedbcom-memcached-editor/ui/edit-ui.yaml index 94a7ee222b..e8f40bda5c 100644 --- a/charts/kubedbcom-memcached-editor/ui/edit-ui.yaml +++ b/charts/kubedbcom-memcached-editor/ui/edit-ui.yaml @@ -100,7 +100,6 @@ step: name: returnFalse - type: block-layout showLabels: false - # schema: schema/properties/resources/properties/monitoringCoreosComServiceMonitor/properties/spec/properties/selector if: type: function name: returnFalse @@ -114,7 +113,6 @@ step: if: type: function name: isEqualToModelPathValue|prometheus.io|/resources/kubedbComMemcached/spec/monitor/agent - # individualItemDisabilityCheck: disableLableChecker - type: label-element label: Exporter Configuration schema: '' @@ -163,7 +161,6 @@ step: element: type: input label: Args - # isSubsection: true - type: block-layout label: Metadata showLabels: false @@ -265,8 +262,8 @@ step: elements: - type: block-layout if: - type: function - name: isConsole + type: function + name: isConsole elements: - type: input label: Name @@ -322,7 +319,6 @@ step: - type: block-layout label: Memcached showLabels: true - # schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/compute/properties/memcached elements: - type: select label: Trigger @@ -422,7 +418,6 @@ step: type: function name: hasNoAnnotations showLabels: true - # schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/compute/properties/nodeTopology elements: - type: select label: Select Node Topology @@ -447,7 +442,6 @@ step: if: type: function name: showOpsRequestOptions - # schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions elements: - type: select label: Timeout @@ -477,4 +471,4 @@ step: value: IfReady - text: Always (OpsRequest will always be applied) value: Always - schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions/properties/apply \ No newline at end of file + schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions/properties/apply diff --git a/charts/kubedbcom-memcached-editor/ui/functions.js b/charts/kubedbcom-memcached-editor/ui/functions.js index c398e8e53a..609315a181 100644 --- a/charts/kubedbcom-memcached-editor/ui/functions.js +++ b/charts/kubedbcom-memcached-editor/ui/functions.js @@ -275,8 +275,10 @@ export const useFunc = (model) => { const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-mongodb-editor/ui/functions.js b/charts/kubedbcom-mongodb-editor/ui/functions.js index f9739f4e66..e96f5e5684 100644 --- a/charts/kubedbcom-mongodb-editor/ui/functions.js +++ b/charts/kubedbcom-mongodb-editor/ui/functions.js @@ -3165,8 +3165,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-mssqlserver-editor/ui/edit-ui.yaml b/charts/kubedbcom-mssqlserver-editor/ui/edit-ui.yaml index fd2f759931..5340a0b127 100644 --- a/charts/kubedbcom-mssqlserver-editor/ui/edit-ui.yaml +++ b/charts/kubedbcom-mssqlserver-editor/ui/edit-ui.yaml @@ -182,142 +182,6 @@ step: func: initMetadata paths: - schema/properties/resources/properties/autoscalingKubedbComMSSQLServerAutoscaler/properties/spec/properties/databaseRef/properties/name - - - type: radio - label: Schedule a Backup? - schema: temp/properties/scheduleBackup - isHorizontal: true - options: - - text: 'Yes' - value: 'yes' - - text: 'No' - value: 'no' - if: - type: function - name: showScheduleBackup - init: - type: func - value: initScheduleBackupForEdit - watcher: - func: onScheduleBackupChange - paths: - - temp/properties/scheduleBackup - - type: block-layout - label: Backup Form - showLabels: false - loader: initBackupData - if: - type: function - name: showBackupForm - elements: - - type: radio - label: Select Backup Type - schema: temp/properties/backupType - isHorizontal: true - options: - - text: BackupConfig - value: BackupConfig - description: 'Create, Delete or Modify BackupConfig' - - text: BackupBlueprint - value: BackupBlueprint - description: Enable/Disable BackupBlueprint - if: - type: function - name: isBackupDataLoadedTrue - init: - type: func - value: setBackupType - loader: getTypes - watcher: - func: onBackupTypeChange - paths: - - temp/properties/backupType - - type: block-layout - label: Config - if: - type: function - name: isBackupType|BackupConfig - elements: - - type: select - label: Select Context - schema: temp/properties/backupConfigContext - validation: - type: required - loader: getContext - watcher: - func: onContextChange - paths: - - temp/properties/backupConfigContext - - type: select - label: Select BackupConfig - schema: temp/properties/config - validation: - type: required - if: - type: function - name: showConfigList - loader: getConfigList - watcher: - func: onConfigChange - paths: - - temp/properties/config - - type: input - label: Schedule - schema: temp/properties/schedule - validation: - type: required - if: - type: function - name: showSchedule - loader: - name: getDefaultSchedule|/resources/coreKubestashComBackupConfiguration/spec/sessions - watchPaths: - - temp/properties/config - watcher: - func: onInputChangeSchedule|/resources/coreKubestashComBackupConfiguration/spec/sessions|schedule - paths: - - temp/properties/schedule - - type: switch - label: Paused - schema: schema/properties/resources/properties/coreKubestashComBackupConfiguration/properties/spec/properties/paused - if: - type: function - name: showPause - - type: block-layout - label: Blueprint - if: - type: function - name: isBackupType|BackupBlueprint - elements: - - type: switch - label: Enable Backup Blueprint - fullwidth: true - subtitle: Use a backup blueprint template to automatically configure backups for similar databases - schema: temp/properties/blueprintEnabled - init: - type: func - value: setBlueprintSwitch - watcher: - func: onBlueprintChange - paths: - - temp/properties/blueprintEnabled - - type: block-layout - label: Archiver - if: - type: function - name: isBackupType|Archiver - elements: - - type: switch - label: Enable Archiver - schema: temp/properties/archiverEnabled - init: - type: func - value: setArchiverSwitch - watcher: - func: onArchiverChange - paths: - - temp/properties/archiverEnabled - - type: single-step-form id: monitoring loader: initMonitoring diff --git a/charts/kubedbcom-mssqlserver-editor/ui/functions.js b/charts/kubedbcom-mssqlserver-editor/ui/functions.js index 4ec453a113..267ba31475 100644 --- a/charts/kubedbcom-mssqlserver-editor/ui/functions.js +++ b/charts/kubedbcom-mssqlserver-editor/ui/functions.js @@ -847,8 +847,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-mysql-editor/ui/functions.js b/charts/kubedbcom-mysql-editor/ui/functions.js index 9f656c530c..ec977e6b73 100644 --- a/charts/kubedbcom-mysql-editor/ui/functions.js +++ b/charts/kubedbcom-mysql-editor/ui/functions.js @@ -756,8 +756,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-perconaxtradb-editor/ui/functions.js b/charts/kubedbcom-perconaxtradb-editor/ui/functions.js index 9d2e030383..3e41689c9c 100644 --- a/charts/kubedbcom-perconaxtradb-editor/ui/functions.js +++ b/charts/kubedbcom-perconaxtradb-editor/ui/functions.js @@ -326,8 +326,10 @@ export const useFunc = (model) => { const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-pgbouncer-editor/ui/functions.js b/charts/kubedbcom-pgbouncer-editor/ui/functions.js index 78ea7b2131..fe7cd5e101 100644 --- a/charts/kubedbcom-pgbouncer-editor/ui/functions.js +++ b/charts/kubedbcom-pgbouncer-editor/ui/functions.js @@ -292,8 +292,10 @@ export const useFunc = (model) => { const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-pgpool-editor/ui/functions.js b/charts/kubedbcom-pgpool-editor/ui/functions.js index eecfe0b9b3..ec453245a2 100644 --- a/charts/kubedbcom-pgpool-editor/ui/functions.js +++ b/charts/kubedbcom-pgpool-editor/ui/functions.js @@ -342,8 +342,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-postgres-editor/ui/functions.js b/charts/kubedbcom-postgres-editor/ui/functions.js index b2a54668a3..de023a6bc9 100644 --- a/charts/kubedbcom-postgres-editor/ui/functions.js +++ b/charts/kubedbcom-postgres-editor/ui/functions.js @@ -859,8 +859,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-proxysql-editor/ui/functions.js b/charts/kubedbcom-proxysql-editor/ui/functions.js index 2a4a272684..dc6abf2cce 100644 --- a/charts/kubedbcom-proxysql-editor/ui/functions.js +++ b/charts/kubedbcom-proxysql-editor/ui/functions.js @@ -324,8 +324,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-rabbitmq-editor/ui/functions.js b/charts/kubedbcom-rabbitmq-editor/ui/functions.js index cd931d46f9..5cdbbebdfa 100644 --- a/charts/kubedbcom-rabbitmq-editor/ui/functions.js +++ b/charts/kubedbcom-rabbitmq-editor/ui/functions.js @@ -784,8 +784,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-redis-editor/ui/functions.js b/charts/kubedbcom-redis-editor/ui/functions.js index 1b7fd1aab6..13d3a2cc50 100644 --- a/charts/kubedbcom-redis-editor/ui/functions.js +++ b/charts/kubedbcom-redis-editor/ui/functions.js @@ -820,8 +820,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-singlestore-editor/ui/functions.js b/charts/kubedbcom-singlestore-editor/ui/functions.js index 5764a0b3ff..0cf3b346e7 100644 --- a/charts/kubedbcom-singlestore-editor/ui/functions.js +++ b/charts/kubedbcom-singlestore-editor/ui/functions.js @@ -1536,8 +1536,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-solr-editor/ui/functions.js b/charts/kubedbcom-solr-editor/ui/functions.js index df12c74bbc..2031bc960c 100644 --- a/charts/kubedbcom-solr-editor/ui/functions.js +++ b/charts/kubedbcom-solr-editor/ui/functions.js @@ -333,11 +333,11 @@ export const useFunc = (model) => { } function getMachines(type, minmax) { - watchDependency('discriminator#/topologyMachines') + // watchDependency('discriminator#/topologyMachines') const depends = minmax === 'min' ? 'max' : 'min' const dependantPath = `/allowedMachine-${type}-${depends}` - watchDependency(`discriminator#${dependantPath}`) + //watchDependency(`discriminator#${dependantPath}`) const dependantMachineObj = getValue(discriminator, dependantPath) const dependantMachine = dependantMachineObj?.machine || '' @@ -348,8 +348,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/kubedbcom-zookeeper-editor/ui/functions.js b/charts/kubedbcom-zookeeper-editor/ui/functions.js index d1b4bc1f0e..d60aeacc4e 100644 --- a/charts/kubedbcom-zookeeper-editor/ui/functions.js +++ b/charts/kubedbcom-zookeeper-editor/ui/functions.js @@ -1114,8 +1114,10 @@ export const useFunc = (model) => { // Return array with text and value object (expected format for machine-compare loader) const machines = nodeGroups?.map((item) => { const text = item.topologyValue + const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}` return { text, + subtext, value: { machine: item.topologyValue, cpu: item.allocatable?.cpu, diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml index d0d82a02de..1661119dcb 100644 --- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml @@ -131,6 +131,7 @@ step: elements: - type: machine-compare label: Resources + subtitle: Compare your current machine configuration with the proposed memory adjustments and make informed decisions for your database setup loader: getMachines init: type: func @@ -140,54 +141,74 @@ step: paths: - temp/properties/machine schema: temp/properties/machine - - type: select - label: Node Selection Policy - options: - - text: LabelSelector - value: LabelSelector - - text: Taint - value: Taint - schema: schema/properties/spec/properties/verticalScaling/properties/memcached/properties/nodeSelectionPolicy - type: block-layout - label: Topology - showLabels: true - elements: - - type: input - label: Key - validation: - type: custom - name: isVerticalScaleTopologyRequired - schema: temp/topologyKey - - type: input - label: Value - validation: - type: custom - name: isVerticalScaleTopologyRequired - schema: temp/topologyValue - - type: block-layout - label: Exporter + label: Node Selection 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: block-layout + showLabels: false + hideBorder: true + elements: + - type: label-element + label: Node Selection Policy + subtitle: Control where your workloads runs by configuring node selection criteria. Use label selectors to match specific nodes or taints to avoid unsuitable nodes + - type: select + label: Node Selection Policy + schema: schema/properties/spec/properties/verticalScaling/properties/memcached/properties/nodeSelectionPolicy + options: + - text: LabelSelector + value: LabelSelector + - text: Taint + value: Taint + - type: info + label: " Label Selector: Specify key-value pairs to target nodes that match your workload's requirements.
Taints: Define tolerations for node taints to ensure your workload runs only on compatible nodes" + customClass: mt-20 + - type: label-element + label: Topology + subtitle: Define node topology preferences, such as zone or region. For example, 'zone=us-central1-a' ensures workloads are deployed in that zone. + - type: horizontal-layout + elements: - 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 + label: Key + validation: + type: custom + name: isVerticalScaleTopologyRequired|memcached + schema: temp/topologyKey-memcached + - type: input + label: Value + validation: + type: custom + name: isVerticalScaleTopologyRequired|memcached + schema: temp/topologyValue-memcached + - type: block-layout + label: Exporter + showLabels: true + hideBlock: true + elements: + - type: label-element + label: Exporter + subtitle: Configure resource requests for the exporter. These settings determine the CPU and memory allocated to monitor your database metrics. + - type: horizontal-layout + showLabels: true + elements: + - type: input + label: CPU + init: + type: func + value: setExporter|memcached|cpu + schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/properties/cpu + - type: input + label: Memory + init: + type: func + value: setExporter|memcached|memory + schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/properties/memory + watcher: + func: onExporterResourceChange|memcached + paths: + - schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/requests/properties/memory # Reconfigure - type: block-layout label: Reconfigure Form @@ -199,183 +220,189 @@ step: watchPaths: - schema/properties/metadata/properties/namespace elements: + - type: label-element + label: '' + subtitle: Select a new configuration secret, apply a custom configuration, or remove an existing setup to update your database settings - type: block-layout label: Configuration + showLabels: false elements: - - type: label-element - label: '' - subtitle: Select a new configuration secret, apply a custom configuration, or remove an existing setup to update your database settings - type: tab-layout label: New Config Secret schema: temp/properties/reconfigurationType options: - - text: NEW CONFIG SECRET - value: selectNewConfigSecret - - text: APPLY CONFIG - value: applyConfig - - text: REMOVE - value: remove + - text: NEW CONFIG SECRET + value: selectNewConfigSecret + - text: APPLY CONFIG + value: applyConfig + - text: REMOVE + value: remove elements: - - type: block-layout - label: Config Secret - if: - name: ifReconfigurationTypeEqualsTo|selectNewConfigSecret - type: function - elements: - - type: label-element - label: Config Secret - subtitle: Select a configuration secret from the available list to update your database settings - customClass: mb-10 - - type: select - customClass: mb-2 - schema: schema/properties/spec/properties/configuration/properties/configSecret/properties/name - refresh: true - label: Config Secret - loader: - name: getConfigSecrets - watchPaths: - - schema/properties/metadata/properties/namespace - - temp/properties/createSecret/properties/status - init: - type: func - value: setValueFromDbDetails|/spec/configSecret/name - watcher: - func: onCreateSecretChange - paths: - - temp/properties/createSecret/properties/status - - type: label-element - label: '' - loader: - name: getSelectedConfigurationName|create - watchPaths: - - schema/properties/spec/properties/configuration/properties/configSecret/properties/name - - type: block-layout - label: Create a New Config Secret - showLabels: true - if: - type: function - name: isCreateSecret - hasButton: - text: Save - hasCancel: cancelCreateSecret - action: createNewConfigSecret - elements: - - type: input - label: Secret Name - schema: temp/properties/createSecret/properties/name - validation: - type: required - - type: array-object-form - label: String Data - schema: temp/properties/createSecret/properties/data - buttonClass: is-light is-outlined - validation: - type: required - elements: - - type: select - label: Key - schema: key - loader: - name: onSelectedSecretChange - watchPaths: - - temp/properties/createSecret/properties/data - validation: - type: required - - type: textarea - label: Value - schema: value - - type: multi-file-editor - editorHeight: 500px - readonly: true - if: - type: function - name: isNotCreateSecret - loader: - name: onNewConfigSecretChange - watchPaths: - - schema/properties/spec/properties/configuration/properties/configSecret/properties/name - schema: temp/properties/newConfigSecret - - type: block-layout - label: ApplyConfig - if: - name: ifReconfigurationTypeEqualsTo|applyConfig - type: function - elements: - - type: label-element - label: New Apply Config - subtitle: Define custom configurations for your database using key-value pairs. These parameters will overwrite existing settings.
Enter the parameter you want to configure (e.g., max_connections). - customClass: mb-10 - - type: select - customClass: mb-2 - schema: temp/properties/selectedConfiguration - refresh: true - label: Configuration - loader: getConfigSecretsforAppyConfig - - type: label-element - label: '' - loader: - name: getSelectedConfigurationName|apply - watchPaths: - - temp/properties/selectedConfiguration - - type: multi-file-editor - editorHeight: 500px - schema: temp/properties/applyConfig - loader: - name: setApplyConfig - watchPaths: + - type: block-layout + label: Config Secret + if: + name: ifReconfigurationTypeEqualsTo|selectNewConfigSecret + type: function + elements: + - type: label-element + label: Config Secret + subtitle: Select a configuration secret from the available list to update your database settings + customClass: mb-10 + - type: select + customClass: mb-2 + schema: schema/properties/spec/properties/configuration/properties/configSecret/properties/name + refresh: true + label: Config Secret + loader: + name: getConfigSecrets + watchPaths: + - schema/properties/metadata/properties/namespace + - temp/properties/createSecret/properties/status + init: + type: func + value: setValueFromDbDetails|/spec/configSecret/name + watcher: + func: onCreateSecretChange + paths: + - temp/properties/createSecret/properties/status + - type: label-element + label: '' + loader: + name: getSelectedConfigurationName|create + watchPaths: + - schema/properties/spec/properties/configuration/properties/configSecret/properties/name + - type: block-layout + label: Create a New Config Secret + showLabels: true + if: + type: function + name: isCreateSecret + hasButton: + text: Save + hasCancel: cancelCreateSecret + action: createNewConfigSecret + elements: + - type: input + label: Secret Name + schema: temp/properties/createSecret/properties/name + validation: + type: required + - type: array-object-form + label: String Data + schema: temp/properties/createSecret/properties/data + buttonClass: is-light is-outlined + validation: + type: required + elements: + - type: select + label: Key + schema: key + loader: + name: onSelectedSecretChange + watchPaths: + - temp/properties/createSecret/properties/data + validation: + type: required + - type: textarea + label: Value + schema: value + - type: multi-file-editor + editorHeight: 500px + readonly: true + if: + type: function + name: isNotCreateSecret + loader: + name: onNewConfigSecretChange + watchPaths: + - schema/properties/spec/properties/configuration/properties/configSecret/properties/name + schema: temp/properties/newConfigSecret + - type: block-layout + label: ApplyConfig + if: + name: ifReconfigurationTypeEqualsTo|applyConfig + type: function + elements: + - type: label-element + label: New Apply Config + subtitle: Define custom configurations for your database using key-value pairs. These parameters will overwrite existing settings.
Enter the parameter you want to configure (e.g., max_connections). + customClass: mb-10 + - type: select + customClass: mb-2 + schema: temp/properties/selectedConfiguration + refresh: true + label: Configuration + loader: getConfigSecretsforAppyConfig + - type: label-element + label: '' + loader: + name: getSelectedConfigurationName|apply + watchPaths: + - temp/properties/selectedConfiguration + - type: multi-file-editor + editorHeight: 500px + schema: temp/properties/applyConfig + loader: + name: setApplyConfig + watchPaths: - temp/properties/selectedConfiguration - watcher: - func: onApplyconfigChange - paths: - - temp/properties/applyConfig - - type: block-layout - label: Remove - if: - name: ifReconfigurationTypeEqualsTo|remove - type: function - elements: - - type: label-element - label: Remove - subtitle: Selected a configuration secret from the available list to update your database settings - customClass: mb-10 - - type: select - customClass: mb-2 - schema: temp/properties/selectedConfigurationRemove - refresh: true - label: Configuration - loader: - name: getConfigSecretsforAppyConfig - watchPaths: - - schema/properties/metadata/properties/namespace - - type: label-element - label: '' - loader: - name: getSelectedConfigurationName|remove - watchPaths: - - temp/properties/selectedConfigurationRemove - - type: multi-file-editor - editorHeight: 500px - readonly: true - init: - type: func - value: onRemoveConfigChange - watcher: - func: onRemoveConfigChange - paths: - - temp/properties/selectedConfigurationRemove - schema: temp/properties/removeConfig + watcher: + func: onApplyconfigChange + paths: + - temp/properties/applyConfig + - type: block-layout + label: Remove + if: + name: ifReconfigurationTypeEqualsTo|remove + type: function + elements: + - type: label-element + label: Remove + subtitle: Selected a configuration secret from the available list to update your database settings + customClass: mb-10 + - type: select + customClass: mb-2 + schema: temp/properties/selectedConfigurationRemove + refresh: true + label: Configuration + loader: + name: getConfigSecretsforAppyConfig + watchPaths: + - schema/properties/metadata/properties/namespace + - type: label-element + label: '' + loader: + name: getSelectedConfigurationName|remove + watchPaths: + - temp/properties/selectedConfigurationRemove + - type: multi-file-editor + editorHeight: 500px + readonly: true + init: + type: func + value: onRemoveConfigChange + watcher: + func: onRemoveConfigChange + paths: + - temp/properties/selectedConfigurationRemove + schema: temp/properties/removeConfig # common - - type: time-picker - label: Timeout - schema: 'schema/properties/spec/properties/timeout' - - type: radio - label: apply - schema: 'schema/properties/spec/properties/apply' - init: - type: func - value: setApplyToIfReady - options: - - text: IfReady (OpsRequest will be applied if database is ready) - value: IfReady - - text: Always (OpsRequest will always be applied) - value: Always + - type: block-layout + label: OpsRequest Options + showLabels: true + elements: + - type: time-picker + label: Timeout + schema: schema/properties/spec/properties/timeout + subtitle: Specify the maximum time allowed for the scaling operation to complete. Use formats like 30sec, 1min(1 minute) or 2h(2 hours). + - type: radio + label: Apply + schema: schema/properties/spec/properties/apply + init: + type: func + value: setApplyToIfReady + options: + - text: IfReady (OpsRequest will be applied if database is ready) + value: IfReady + - text: Always (OpsRequest will always be applied) + value: Always \ No newline at end of file diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml index f7496e1f88..bea9915145 100644 --- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml @@ -222,38 +222,6 @@ step: func: onExporterResourceChange|memory paths: - schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources/properties/limits/properties/memory - - type: horizontal-layout - showLabels: true - label: Exporter - # schema: schema/properties/spec/properties/verticalScaling/properties/exporter/properties/resources - # init: - # type: func - # value: setValueFromDbDetails|/spec/monitor/prometheus/exporter/resources|/spec/verticalScaling/exporter/resources - 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 # Volume Expansion - type: block-layout label: Volume Expansion Form diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml index 6b76dddab5..6d03577d39 100644 --- a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml @@ -497,6 +497,8 @@ step: type: func value: setSSLMode options: + - text: disable + value: disable - text: allow value: allow - text: prefer