Skip to content

Commit 449e483

Browse files
Sourav-Kumar-19SamiulSourav
authored andcommitted
fixed some issues in solr db and added subtext for compute autoscaling (#965)
Signed-off-by: Samiul <samiul@appscode.com>
1 parent 32b72b5 commit 449e483

File tree

25 files changed

+286
-391
lines changed

25 files changed

+286
-391
lines changed

charts/kubedbcom-clickhouse-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,10 @@ export const useFunc = (model) => {
261261

262262
const machines = nodeGroups?.map((item) => {
263263
const text = item.topologyValue
264+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
264265
return {
265266
text,
267+
subtext,
266268
value: {
267269
machine: item.topologyValue,
268270
cpu: item.allocatable?.cpu,

charts/kubedbcom-druid-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,8 +1602,10 @@ export const useFunc = (model) => {
16021602
// Return array with text and value object (expected format for machine-compare loader)
16031603
const machines = nodeGroups?.map((item) => {
16041604
const text = item.topologyValue
1605+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
16051606
return {
16061607
text,
1608+
subtext,
16071609
value: {
16081610
machine: item.topologyValue,
16091611
cpu: item.allocatable?.cpu,

charts/kubedbcom-elasticsearch-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,8 +853,10 @@ export const useFunc = (model) => {
853853
// Return array with text and value object (expected format for machine-compare loader)
854854
const machines = nodeGroups?.map((item) => {
855855
const text = item.topologyValue
856+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
856857
return {
857858
text,
859+
subtext,
858860
value: {
859861
machine: item.topologyValue,
860862
cpu: item.allocatable?.cpu,

charts/kubedbcom-ferretdb-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,10 @@ export const useFunc = (model) => {
298298
// Return array with text and value object (expected format for machine-compare loader)
299299
const machines = nodeGroups?.map((item) => {
300300
const text = item.topologyValue
301+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
301302
return {
302303
text,
304+
subtext,
303305
value: {
304306
machine: item.topologyValue,
305307
cpu: item.allocatable?.cpu,

charts/kubedbcom-kafka-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,10 @@ export const useFunc = (model) => {
275275
// Return array with text and value object (expected format for machine-compare loader)
276276
const machines = nodeGroups?.map((item) => {
277277
const text = item.topologyValue
278+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
278279
return {
279280
text,
281+
subtext,
280282
value: {
281283
machine: item.topologyValue,
282284
cpu: item.allocatable?.cpu,

charts/kubedbcom-mariadb-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,10 @@ export const useFunc = (model) => {
10031003
// Return array with text and value object (expected format for machine-compare loader)
10041004
const machines = nodeGroups?.map((item) => {
10051005
const text = item.topologyValue
1006+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
10061007
return {
10071008
text,
1009+
subtext,
10081010
value: {
10091011
machine: item.topologyValue,
10101012
cpu: item.allocatable?.cpu,

charts/kubedbcom-memcached-editor/ui/edit-ui.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ step:
100100
name: returnFalse
101101
- type: block-layout
102102
showLabels: false
103-
# schema: schema/properties/resources/properties/monitoringCoreosComServiceMonitor/properties/spec/properties/selector
104103
if:
105104
type: function
106105
name: returnFalse
@@ -114,7 +113,6 @@ step:
114113
if:
115114
type: function
116115
name: isEqualToModelPathValue|prometheus.io|/resources/kubedbComMemcached/spec/monitor/agent
117-
# individualItemDisabilityCheck: disableLableChecker
118116
- type: label-element
119117
label: Exporter Configuration
120118
schema: ''
@@ -163,7 +161,6 @@ step:
163161
element:
164162
type: input
165163
label: Args
166-
# isSubsection: true
167164
- type: block-layout
168165
label: Metadata
169166
showLabels: false
@@ -265,8 +262,8 @@ step:
265262
elements:
266263
- type: block-layout
267264
if:
268-
type: function
269-
name: isConsole
265+
type: function
266+
name: isConsole
270267
elements:
271268
- type: input
272269
label: Name
@@ -322,7 +319,6 @@ step:
322319
- type: block-layout
323320
label: Memcached
324321
showLabels: true
325-
# schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/compute/properties/memcached
326322
elements:
327323
- type: select
328324
label: Trigger
@@ -422,7 +418,6 @@ step:
422418
type: function
423419
name: hasNoAnnotations
424420
showLabels: true
425-
# schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/compute/properties/nodeTopology
426421
elements:
427422
- type: select
428423
label: Select Node Topology
@@ -447,7 +442,6 @@ step:
447442
if:
448443
type: function
449444
name: showOpsRequestOptions
450-
# schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions
451445
elements:
452446
- type: select
453447
label: Timeout
@@ -477,4 +471,4 @@ step:
477471
value: IfReady
478472
- text: Always (OpsRequest will always be applied)
479473
value: Always
480-
schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions/properties/apply
474+
schema: schema/properties/resources/properties/autoscalingKubedbComMemcachedAutoscaler/properties/spec/properties/opsRequestOptions/properties/apply

charts/kubedbcom-memcached-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,10 @@ export const useFunc = (model) => {
275275

276276
const machines = nodeGroups?.map((item) => {
277277
const text = item.topologyValue
278+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
278279
return {
279280
text,
281+
subtext,
280282
value: {
281283
machine: item.topologyValue,
282284
cpu: item.allocatable?.cpu,

charts/kubedbcom-mongodb-editor/ui/functions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3165,8 +3165,10 @@ export const useFunc = (model) => {
31653165
// Return array with text and value object (expected format for machine-compare loader)
31663166
const machines = nodeGroups?.map((item) => {
31673167
const text = item.topologyValue
3168+
const subtext = `CPU: ${item.allocatable?.cpu}, Memory: ${item.allocatable?.memory}`
31683169
return {
31693170
text,
3171+
subtext,
31703172
value: {
31713173
machine: item.topologyValue,
31723174
cpu: item.allocatable?.cpu,

charts/kubedbcom-mssqlserver-editor/ui/edit-ui.yaml

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -182,142 +182,6 @@ step:
182182
func: initMetadata
183183
paths:
184184
- schema/properties/resources/properties/autoscalingKubedbComMSSQLServerAutoscaler/properties/spec/properties/databaseRef/properties/name
185-
186-
- type: radio
187-
label: Schedule a Backup?
188-
schema: temp/properties/scheduleBackup
189-
isHorizontal: true
190-
options:
191-
- text: 'Yes'
192-
value: 'yes'
193-
- text: 'No'
194-
value: 'no'
195-
if:
196-
type: function
197-
name: showScheduleBackup
198-
init:
199-
type: func
200-
value: initScheduleBackupForEdit
201-
watcher:
202-
func: onScheduleBackupChange
203-
paths:
204-
- temp/properties/scheduleBackup
205-
- type: block-layout
206-
label: Backup Form
207-
showLabels: false
208-
loader: initBackupData
209-
if:
210-
type: function
211-
name: showBackupForm
212-
elements:
213-
- type: radio
214-
label: Select Backup Type
215-
schema: temp/properties/backupType
216-
isHorizontal: true
217-
options:
218-
- text: BackupConfig
219-
value: BackupConfig
220-
description: 'Create, Delete or Modify BackupConfig'
221-
- text: BackupBlueprint
222-
value: BackupBlueprint
223-
description: Enable/Disable BackupBlueprint
224-
if:
225-
type: function
226-
name: isBackupDataLoadedTrue
227-
init:
228-
type: func
229-
value: setBackupType
230-
loader: getTypes
231-
watcher:
232-
func: onBackupTypeChange
233-
paths:
234-
- temp/properties/backupType
235-
- type: block-layout
236-
label: Config
237-
if:
238-
type: function
239-
name: isBackupType|BackupConfig
240-
elements:
241-
- type: select
242-
label: Select Context
243-
schema: temp/properties/backupConfigContext
244-
validation:
245-
type: required
246-
loader: getContext
247-
watcher:
248-
func: onContextChange
249-
paths:
250-
- temp/properties/backupConfigContext
251-
- type: select
252-
label: Select BackupConfig
253-
schema: temp/properties/config
254-
validation:
255-
type: required
256-
if:
257-
type: function
258-
name: showConfigList
259-
loader: getConfigList
260-
watcher:
261-
func: onConfigChange
262-
paths:
263-
- temp/properties/config
264-
- type: input
265-
label: Schedule
266-
schema: temp/properties/schedule
267-
validation:
268-
type: required
269-
if:
270-
type: function
271-
name: showSchedule
272-
loader:
273-
name: getDefaultSchedule|/resources/coreKubestashComBackupConfiguration/spec/sessions
274-
watchPaths:
275-
- temp/properties/config
276-
watcher:
277-
func: onInputChangeSchedule|/resources/coreKubestashComBackupConfiguration/spec/sessions|schedule
278-
paths:
279-
- temp/properties/schedule
280-
- type: switch
281-
label: Paused
282-
schema: schema/properties/resources/properties/coreKubestashComBackupConfiguration/properties/spec/properties/paused
283-
if:
284-
type: function
285-
name: showPause
286-
- type: block-layout
287-
label: Blueprint
288-
if:
289-
type: function
290-
name: isBackupType|BackupBlueprint
291-
elements:
292-
- type: switch
293-
label: Enable Backup Blueprint
294-
fullwidth: true
295-
subtitle: Use a backup blueprint template to automatically configure backups for similar databases
296-
schema: temp/properties/blueprintEnabled
297-
init:
298-
type: func
299-
value: setBlueprintSwitch
300-
watcher:
301-
func: onBlueprintChange
302-
paths:
303-
- temp/properties/blueprintEnabled
304-
- type: block-layout
305-
label: Archiver
306-
if:
307-
type: function
308-
name: isBackupType|Archiver
309-
elements:
310-
- type: switch
311-
label: Enable Archiver
312-
schema: temp/properties/archiverEnabled
313-
init:
314-
type: func
315-
value: setArchiverSwitch
316-
watcher:
317-
func: onArchiverChange
318-
paths:
319-
- temp/properties/archiverEnabled
320-
321185
- type: single-step-form
322186
id: monitoring
323187
loader: initMonitoring

0 commit comments

Comments
 (0)