Skip to content

Commit 8892ac2

Browse files
committed
add oracle ops create-ui
Signed-off-by: Samiul <samiul@appscode.com>
1 parent 8e1f38b commit 8892ac2

3 files changed

Lines changed: 23 additions & 16 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ step:
122122
type: func
123123
value: setValueFromDbDetails|/spec/replicas
124124
label: Replicas
125-
schema: schema/properties/spec/properties/horizontalScaling/properties/member
125+
schema: schema/properties/spec/properties/horizontalScaling/properties/replicas
126126
subtitle: Define the total number of replicas for the database. Increasing
127127
replicas improves fault tolerance and load distribution , while reducing
128128
replicas conserves resources
@@ -131,9 +131,6 @@ step:
131131
label: Each replica represents an independent copy of your database. For example,
132132
setting this to 3 creates three copies of the database for better availability.
133133
type: info
134-
if:
135-
name: ifDbTypeEqualsTo|cluster|horizontalScaling
136-
type: function
137134
type: horizontal-layout
138135
fixedBlock: true
139136
if:

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ export const useFunc = (model) => {
397397
// watchDependency('model#/metadata/namespace')
398398

399399
const resp = await axios.get(
400-
`/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/mysqls`,
400+
`/clusters/${owner}/${cluster}/proxy/kubedb.com/v1alpha2/namespaces/${namespace}/documentdbs`,
401401
{
402402
params: { filter: { items: { metadata: { name: null } } } },
403403
},
@@ -423,7 +423,7 @@ export const useFunc = (model) => {
423423
const name = storeGet('/route/params/name') || getValue(model, '/spec/databaseRef/name')
424424

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/v1alpha2/namespaces/${namespace}/documentdbs/${name}`
427427
const resp = await axios.get(url)
428428

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

454454
try {
455-
presetVersions = presets.admin?.databases?.MySQL?.versions?.available || []
455+
presetVersions = presets.admin?.databases?.DocumentDB?.versions?.available || []
456456
const queryParams = {
457457
filter: {
458458
items: {
@@ -463,7 +463,7 @@ export const useFunc = (model) => {
463463
}
464464

465465
const resp = await axios.get(
466-
`/clusters/${owner}/${cluster}/proxy/catalog.kubedb.com/v1alpha1/mysqlversions`,
466+
`/clusters/${owner}/${cluster}/proxy/catalog.kubedb.com/v1alpha1/documentdbversions`,
467467
{
468468
params: queryParams,
469469
},
@@ -489,7 +489,7 @@ export const useFunc = (model) => {
489489

490490
// keep only non deprecated & kubedb-ui-presets & within constraints of current version
491491
// if presets.status is 404, it means no presets available, no need to filter with presets
492-
const filteredMySQLVersions = sortedVersions.filter((item) => {
492+
const filteredDocumentDBVersions = sortedVersions.filter((item) => {
493493
// default limit 0.0 means no restrictions, show all higher versions
494494
if (limit === '0.0')
495495
return (
@@ -518,9 +518,9 @@ export const useFunc = (model) => {
518518
isVersionWithinConstraints(item.spec?.version, limit)
519519
)
520520
})
521-
setDiscriminatorValue('/filteredVersion', filteredMySQLVersions)
521+
setDiscriminatorValue('/filteredVersion', filteredDocumentDBVersions)
522522

523-
return filteredMySQLVersions.map((item) => {
523+
return filteredDocumentDBVersions.map((item) => {
524524
const name = (item.metadata && item.metadata.name) || ''
525525
const specVersion = (item.spec && item.spec.version) || ''
526526
return {
@@ -782,7 +782,10 @@ export const useFunc = (model) => {
782782
function getMachines() {
783783
const presets = storeGet('/kubedbuiPresets') || {}
784784
const dbDetails = getValue(discriminator, '/dbDetails')
785-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
785+
const containers = dbDetails?.spec?.topology?.[type]?.podTemplate?.spec?.containers || []
786+
const kind = dbDetails?.kind
787+
const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
788+
const limits = resource[0]?.resources?.requests || {}
786789

787790
const avlMachines = presets.admin?.machineProfiles?.available || []
788791
let arr = []
@@ -832,7 +835,10 @@ export const useFunc = (model) => {
832835

833836
function setMachine() {
834837
const dbDetails = getValue(discriminator, '/dbDetails')
835-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
838+
const containers = dbDetails?.spec?.topology?.[type]?.podTemplate?.spec?.containers || []
839+
const kind = dbDetails?.kind
840+
const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
841+
const limits = resource[0]?.resources?.requests || {}
836842
const annotations = dbDetails?.metadata?.annotations || {}
837843
const instance = annotations['kubernetes.io/instance-type']
838844

@@ -1683,7 +1689,7 @@ export const useFunc = (model) => {
16831689

16841690
const key = getValue(discriminator, '/topologyKey')
16851691
const value = getValue(discriminator, '/topologyValue')
1686-
const path = `/spec/verticalScaling/mysql/topology`
1692+
const path = `/spec/verticalScaling/documentdb/topology`
16871693

16881694
if (key || value) {
16891695
commit('wizard/model$update', {
@@ -1840,7 +1846,11 @@ export const useFunc = (model) => {
18401846

18411847
function isMachineValid() {
18421848
const dbDetails = getValue(discriminator, '/dbDetails')
1843-
const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
1849+
const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
1850+
const kind = dbDetails?.kind
1851+
const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
1852+
const limits = resource[0]?.resources?.requests || {}
1853+
console.log(resource)
18441854

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

charts/opskubedbcom-documentdbopsrequest-editor/ui/language.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bn: {}
22
en:
33
labels:
44
agent: Select a Monitoring Method
5-
mysql: MySQL
5+
documentdb: DocumentDB
66
node_selection_policy: Node Selection Policy
77
topology: Topology
88
alias: Alias

0 commit comments

Comments
 (0)