diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml index 87ee766452..e20b8792dd 100644 --- a/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-druidopsrequest-editor/ui/create-ui.yaml @@ -689,14 +689,14 @@ step: fullwidth: true if: type: function - name: returnFalse + name: isTlsEnabled schema: schema/properties/spec/properties/tls/properties/remove - type: switch label: Rotate Certificates fullwidth: true if: type: function - name: returnFalse + name: isTlsEnabled schema: schema/properties/spec/properties/tls/properties/rotateCertificates - type: block-layout if: @@ -740,6 +740,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates + showLabels: false if: type: function name: showIssuerRefAndCertificates @@ -757,6 +758,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js index d1ef674046..b1b00eecef 100644 --- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js @@ -437,6 +437,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -455,6 +457,11 @@ export const useFunc = (model) => { } else return {} } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + async function getDbVersions() { const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') @@ -844,7 +851,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -894,8 +901,6 @@ export const useFunc = (model) => { } const machine = parsedInstance[type] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1741,6 +1746,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + }else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -2163,5 +2171,6 @@ export const useFunc = (model) => { getNestedValue, hasTopologyType, getResourceConfig, + isTlsEnabled } } diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml index b3b94b6ed6..244263ca7e 100644 --- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml @@ -1335,18 +1335,18 @@ step: - temp/tlsOperation schema: temp/tlsOperation - type: switch - label: 'Remove TLS' + label: Remove TLS fullwidth: true if: type: function - name: returnFalse + name: isTlsEnabled schema: schema/properties/spec/properties/tls/properties/remove - type: switch - label: 'Rotate Certificates' + label: Rotate Certificates fullwidth: true if: type: function - name: returnFalse + name: isTlsEnabled schema: schema/properties/spec/properties/tls/properties/rotateCertificates - type: block-layout label: Issuer Reference @@ -1396,7 +1396,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: type: function name: showIssuerRefAndCertificates @@ -1412,6 +1412,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js index 422b157eeb..7159618f9b 100644 --- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js @@ -446,6 +446,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -478,6 +480,11 @@ export const useFunc = (model) => { } else return {} } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function initDatabaseRef() { // watchDependency('model#/metadata/namespace') const { name } = route.params || {} @@ -896,7 +903,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -945,8 +952,6 @@ export const useFunc = (model) => { } const machine = parsedInstance[type] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1664,6 +1669,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -2070,5 +2078,6 @@ export const useFunc = (model) => { setApplyToIfReady, hasResourceValue, hasVolumeExpansion, + isTlsEnabled } } diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml index 0e4aea9ee8..4ed9887acd 100644 --- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/create-ui.yaml @@ -307,7 +307,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -315,7 +315,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -365,7 +365,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -381,6 +381,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js index 0de3f797cd..a343e5204c 100644 --- a/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-ferretdbopsrequest-editor/ui/functions.js @@ -351,6 +351,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -404,6 +409,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -742,7 +749,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -784,8 +791,6 @@ export const useFunc = (model) => { } const machine = parsedInstance[type] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1035,6 +1040,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1272,5 +1280,6 @@ export const useFunc = (model) => { setMachine, onMachineChange, isMachineCustom, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml index 6754078f21..1523e46af4 100644 --- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml @@ -639,7 +639,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -647,7 +647,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -697,7 +697,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -713,6 +713,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js index c9880fb815..8aae4b135c 100644 --- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js @@ -354,6 +354,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -407,6 +412,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -766,7 +773,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -811,8 +818,6 @@ export const useFunc = (model) => { } const machine = parsedInstance[type] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1549,6 +1554,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1830,5 +1838,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml index 8b7188a519..76e552167e 100644 --- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml @@ -460,7 +460,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -468,7 +468,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: switch label: Require SSL @@ -528,7 +528,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -544,6 +544,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js index 2a4b975299..c2421bdfe4 100644 --- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js @@ -353,6 +353,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -406,6 +411,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -744,7 +751,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -775,8 +782,6 @@ export const useFunc = (model) => { const annotations = dbDetails?.metadata?.annotations || {} const machine = annotations['kubernetes.io/instance-type'] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1432,6 +1437,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1792,5 +1800,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js index 227897e072..693fd1ab94 100644 --- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js @@ -407,6 +407,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -743,7 +745,7 @@ export const useFunc = (model) => { } else { arr = machineList .map((machine) => { - if (machine === 'custom') return { text: machine, value: { machine } } + if (machine === 'custom') return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } const subtext = `CPU: ${machines[machine].resources.limits.cpu}, Memory: ${machines[machine].resources.limits.memory}` const text = machine return { @@ -775,8 +777,6 @@ export const useFunc = (model) => { } const machine = parsedInstance || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml index 217d9d5599..6323f97243 100644 --- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml @@ -1516,7 +1516,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -1524,7 +1524,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -1574,7 +1574,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -1590,6 +1590,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js index 9a507605c2..b6fbcc13c2 100644 --- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js @@ -364,6 +364,11 @@ export const useFunc = (model) => { return true } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -788,7 +793,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -1500,6 +1505,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1879,5 +1887,6 @@ export const useFunc = (model) => { onCreateSecretChange, cancelCreateSecret, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js index 96102b60f6..652d233a56 100644 --- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js @@ -407,6 +407,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -733,7 +735,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -774,8 +776,6 @@ export const useFunc = (model) => { } const machine = parsedInstance || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1430,6 +1430,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml index f88e2eab6e..f7496e1f88 100644 --- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml @@ -503,7 +503,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -511,7 +511,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Require SSL @@ -574,7 +574,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -590,6 +590,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js index 3d89d34b4b..885c320ed7 100644 --- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js @@ -353,6 +353,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -406,6 +411,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -753,7 +760,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -784,8 +791,6 @@ export const useFunc = (model) => { const annotations = dbDetails?.metadata?.annotations || {} const machine = annotations['kubernetes.io/instance-type'] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1444,6 +1449,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1827,5 +1835,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml index ba9ee4a19d..9017defae8 100644 --- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml @@ -481,7 +481,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -489,7 +489,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -539,7 +539,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -555,6 +555,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js index b575be8271..24afa5feed 100644 --- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js @@ -354,6 +354,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -407,6 +412,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -730,7 +737,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -769,8 +776,6 @@ export const useFunc = (model) => { } const machine = parsedInstance || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1435,6 +1440,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1790,5 +1798,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js index 0b5c680993..4dac4d5656 100644 --- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js @@ -407,6 +407,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -736,7 +738,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -775,8 +777,6 @@ export const useFunc = (model) => { machine = 'custom' } - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1427,6 +1427,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml index 9caeba2ed6..d6bbe84454 100644 --- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml @@ -422,7 +422,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -430,7 +430,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -480,7 +480,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -496,6 +496,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js index 94c6f3df62..91c70ec4ed 100644 --- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js @@ -355,6 +355,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -408,6 +413,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -736,7 +743,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -778,8 +785,6 @@ export const useFunc = (model) => { } const machine = parsedInstance || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1504,6 +1509,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1767,5 +1775,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml index 33776d0d0a..6b76dddab5 100644 --- a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml @@ -467,7 +467,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -475,7 +475,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: radio label: Client Auth Mode @@ -556,7 +556,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -572,6 +572,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js index 709b82118b..1d613966d3 100644 --- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js @@ -353,6 +353,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -406,6 +411,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -737,7 +744,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -775,8 +782,6 @@ export const useFunc = (model) => { machine = 'custom' } - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1455,6 +1460,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1878,5 +1886,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml index 62ef384946..1fafd684b2 100644 --- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml @@ -369,7 +369,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -377,7 +377,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -427,7 +427,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -443,6 +443,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js index a876c26a74..b67f691bf5 100644 --- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js @@ -351,6 +351,11 @@ export const useFunc = (model) => { return true } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -404,6 +409,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -724,7 +731,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -758,8 +765,6 @@ export const useFunc = (model) => { const annotations = dbDetails?.metadata?.annotations || {} const machine = annotations['kubernetes.io/instance-type'] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1056,6 +1061,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1295,5 +1303,6 @@ export const useFunc = (model) => { onMySQLUserReqTypeChange, showUserCreationField, showUserDeletionField, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml index 9a36e8c736..644c193ade 100644 --- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml @@ -470,7 +470,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -478,7 +478,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -528,7 +528,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -544,6 +544,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js index badf868eea..64b6e1b956 100644 --- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js @@ -353,6 +353,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + async function getNamespaces() { if (storeGet('/route/params/actions')) return [] const owner = storeGet('/route/params/user') @@ -406,6 +411,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -734,7 +741,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -768,8 +775,6 @@ export const useFunc = (model) => { const annotations = dbDetails?.metadata?.annotations || {} const machine = annotations['kubernetes.io/instance-type'] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1422,6 +1427,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1796,5 +1804,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml index 9a0c7aadd6..1ff87ee479 100644 --- a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml @@ -473,7 +473,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -481,7 +481,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -531,7 +531,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -547,6 +547,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js index 044238d55e..80db59034e 100644 --- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js @@ -353,6 +353,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -406,6 +411,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -739,7 +746,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -770,8 +777,6 @@ export const useFunc = (model) => { const annotations = dbDetails?.metadata?.annotations || {} const machine = annotations['kubernetes.io/instance-type'] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1485,6 +1490,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1792,5 +1800,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml index f7d2c87e47..e9ea07ff51 100644 --- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml @@ -668,7 +668,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -676,7 +676,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -726,7 +726,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -742,6 +742,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js index 05e0e26547..e1a14235ca 100644 --- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js @@ -353,6 +353,11 @@ export const useFunc = (model) => { return false } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -406,6 +411,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -742,7 +749,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -781,8 +788,6 @@ export const useFunc = (model) => { } const machine = parsedInstance[type] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1538,6 +1543,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1841,5 +1849,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml index 1b48af9120..85251a8359 100644 --- a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml +++ b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml @@ -1269,7 +1269,7 @@ step: label: Remove TLS fullwidth: true if: - name: returnFalse + name: isTlsEnabled type: function schema: schema/properties/spec/properties/tls/properties/remove - type: switch @@ -1277,7 +1277,7 @@ step: fullwidth: true schema: schema/properties/spec/properties/tls/properties/rotateCertificates if: - name: returnFalse + name: isTlsEnabled type: function - type: block-layout label: Issuer Reference @@ -1327,7 +1327,7 @@ step: schema: schema/properties/spec/properties/tls/properties/issuerRef/properties/name - type: block-layout label: Certificates - showLabels: true + showLabels: false if: name: showIssuerRefAndCertificates type: function @@ -1343,6 +1343,8 @@ step: loader: fetchAliasOptions disable: disableAlias schema: alias + validation: + type: required - type: input label: Secret Name schema: secretName diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js index 150b1928cb..fd8bd8b1fa 100644 --- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js @@ -357,6 +357,11 @@ export const useFunc = (model) => { return true } + function isTlsEnabled() { + const dbDetails = getValue(discriminator, '/dbDetails') + return (dbDetails?.spec?.sslMode && dbDetails?.spec?.sslMode !== 'disabled' && dbDetails?.spec?.sslMode !== 'disable') || dbDetails?.spec?.tls + } + function isRancherManaged() { const managers = storeGet('/cluster/clusterDefinition/result/clusterManagers') const found = managers.find((item) => item === 'Rancher') @@ -410,6 +415,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -762,7 +769,8 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else + return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -807,8 +815,6 @@ export const useFunc = (model) => { } const machine = parsedInstance[type] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return { @@ -1477,6 +1483,9 @@ export const useFunc = (model) => { return getIssuer(url) } return clusterIssuers + } else if (!kind) { + commit('wizard/model$delete', '/spec/tls/issuerRef/name') + return [] } async function getIssuer(url) { @@ -1834,5 +1843,6 @@ export const useFunc = (model) => { onRemoveConfigChange, onNewConfigSecretChange, onSelectedSecretChange, + isTlsEnabled, } } diff --git a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js index d89c6f517b..ad582ea245 100644 --- a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js +++ b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js @@ -378,6 +378,8 @@ export const useFunc = (model) => { } async function getDbDetails() { + machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] + const owner = storeGet('/route/params/user') const cluster = storeGet('/route/params/cluster') const namespace = storeGet('/route/query/namespace') || getValue(model, '/metadata/namespace') @@ -1412,7 +1414,7 @@ export const useFunc = (model) => { memory: machineData.limits.memory, }, } - } else return { text: machine, value: { machine } } + } else return { text: machine, value: { machine, cpu: limits.cpu, memory: limits.memory } } } }) } else { @@ -1444,8 +1446,6 @@ export const useFunc = (model) => { const annotations = dbDetails?.metadata?.annotations || {} const machine = annotations['kubernetes.io/instance-type'] || 'custom' - machinesFromPreset = storeGet('/kubedbuiPresets')?.admin?.machineProfiles?.machines || [] - const machinePresets = machinesFromPreset.find((item) => item.id === machine) if (machinePresets) { return {