+
{{ label }}
@@ -154,7 +154,7 @@ export default {
margin-right: 10px;
}
}
-.radio-group.label.view{
- color: var(--input-label);
+.radio-group.label{
+ font-size: 1.2em;
}
diff --git a/config/labels-annotations.js b/config/labels-annotations.js
index 7c58a7e26a..9362a14ba6 100644
--- a/config/labels-annotations.js
+++ b/config/labels-annotations.js
@@ -15,6 +15,8 @@ export const RIO = { STACK: 'rio.cattle.io/stack' };
export const CERTMANAGER = { ISSUER: 'cert-manager.io/issuer-name' };
+export const STORAGE = { DEFAULT_STORAGE_CLASS: 'storageclass.kubernetes.io/is-default-class' };
+
export const NODE_ROLES = {
CONTROL_PLANE: 'node-role.kubernetes.io/controlplane',
WORKER: 'node-role.kubernetes.io/worker',
diff --git a/edit/resources.cattle.io.backup.vue b/edit/resources.cattle.io.backup.vue
index 109f948cc1..efb33bddb5 100644
--- a/edit/resources.cattle.io.backup.vue
+++ b/edit/resources.cattle.io.backup.vue
@@ -3,13 +3,13 @@ import CruResource from '@/components/CruResource';
import createEditView from '@/mixins/create-edit-view';
import LabeledInput from '@/components/form/LabeledInput';
import UnitInput from '@/components/form/UnitInput';
-import Checkbox from '@/components/form/Checkbox';
-import FileSelector from '@/components/form/FileSelector';
import LabeledSelect from '@/components/form/LabeledSelect';
import Banner from '@/components/Banner';
import RadioGroup from '@/components/form/RadioGroup';
import NameNsDescription from '@/components/form/NameNsDescription';
import Loading from '@/components/Loading';
+import S3 from '@/chart/backup-restore-operator/S3';
+
import { mapGetters } from 'vuex';
import { SECRET, BACKUP_RESTORE, CATALOG } from '@/config/types';
import { allHash } from '@/utils/promise';
@@ -22,13 +22,12 @@ export default {
CruResource,
UnitInput,
LabeledInput,
- Checkbox,
- FileSelector,
LabeledSelect,
RadioGroup,
NameNsDescription,
Banner,
- Loading
+ Loading,
+ S3
},
mixins: [createEditView],
@@ -77,20 +76,6 @@ export default {
return BRORelease ? BRORelease.spec.namespace : '';
},
- credentialSecret: {
- get() {
- const { credentialSecretName, credentialSecretNamespace } = this.s3;
-
- return { metadata: { name: credentialSecretName, namespace: credentialSecretNamespace } };
- },
- set(neu) {
- const { name, namespace } = neu.metadata;
-
- this.$set(this.s3, 'credentialSecretName', name);
- this.$set(this.s3, 'credentialSecretNamespace', namespace);
- }
- },
-
encryptionSecretNames() {
return this.allSecrets.filter(secret => !!secret.data['encryption-provider-config.yaml'] && secret.metadata.namespace === this.chartNamespace).map(secret => secret.metadata.name);
},
@@ -137,7 +122,7 @@ export default {
if (neu === 'useDefault') {
delete this.value.spec.storageLocation;
} else {
- this.$set(this.value.spec, 'storageLocation', this.s3);
+ this.$set(this.value.spec, 'storageLocation', { s3: this.s3 });
}
},
@@ -224,32 +209,7 @@ export default {
-
-
-
-
-
-
-
-
-
- $set(s3, 'endpointCA', e)" />
-
-
+
diff --git a/edit/resources.cattle.io.restore.vue b/edit/resources.cattle.io.restore.vue
index f4bdd5730d..eb3c3d26c2 100644
--- a/edit/resources.cattle.io.restore.vue
+++ b/edit/resources.cattle.io.restore.vue
@@ -4,10 +4,10 @@ import createEditView from '@/mixins/create-edit-view';
import LabeledInput from '@/components/form/LabeledInput';
import UnitInput from '@/components/form/UnitInput';
import Checkbox from '@/components/form/Checkbox';
-import FileSelector from '@/components/form/FileSelector';
import LabeledSelect from '@/components/form/LabeledSelect';
import Loading from '@/components/Loading';
import RadioGroup from '@/components/form/RadioGroup';
+import S3 from '@/chart/backup-restore-operator/S3';
import { mapGetters } from 'vuex';
import { SECRET, BACKUP_RESTORE, CATALOG } from '@/config/types';
import { allHash } from '@/utils/promise';
@@ -19,7 +19,7 @@ export default {
UnitInput,
LabeledInput,
Checkbox,
- FileSelector,
+ S3,
LabeledSelect,
Loading,
RadioGroup
@@ -79,21 +79,6 @@ export default {
return BRORelease ? BRORelease.spec.namespace : '';
},
- credentialSecret: {
- get() {
- const { credentialSecretName, credentialSecretNamespace } = this.s3;
-
- return { metadata: { name: credentialSecretName, namespace: credentialSecretNamespace } };
- },
-
- set(neu) {
- const { name, namespace } = neu.metadata;
-
- this.$set(this.s3, 'credentialSecretName', name);
- this.$set(this.s3, 'credentialSecretNamespace', namespace);
- }
- },
-
encryptionSecretNames() {
return this.allSecrets.filter(secret => !!secret.data['encryption-provider-config.yaml'] && secret.metadata.namespace === this.chartNamespace).map(secret => secret.metadata.name);
},
@@ -177,38 +162,7 @@ export default {