rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove resourceSetNamespace

This commit is contained in:
Nancy Butler 2020-09-14 11:57:46 -07:00
parent 4152473149
commit 3fdcf4ddad
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
chart/backup-restore-operator/index.vue
View File

@ -6,10 +6,9 @@ import LabeledSelect from '@/components/form/LabeledSelect';
import LabeledInput from '@/components/form/LabeledInput'; import LabeledInput from '@/components/form/LabeledInput';
import { get } from '@/utils/object'; import { get } from '@/utils/object';
import { allHash } from '@/utils/promise'; import { allHash } from '@/utils/promise';
import { STORAGE_CLASS, SECRET, PV, NAMESPACE } from '@/config/types'; import { STORAGE_CLASS, SECRET, PV } from '@/config/types';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { STORAGE } from '@/config/labels-annotations'; import { STORAGE } from '@/config/labels-annotations';
import { sortBy } from '@/utils/sort';
export default { export default {
components: { components: {
@ -30,13 +29,6 @@ export default {
} }
}, },
chart: {
type: Object,
default: () => {
return {};
}
},
mode: { mode: {
type: String, type: String,
default: 'create' default: 'create'
@ -57,11 +49,6 @@ export default {
data() { data() {
const storageSource = this.mode === 'create' ? 's3' : this.getStorageSource(this.value); const storageSource = this.mode === 'create' ? 's3' : this.getStorageSource(this.value);
const chartNamespace = this.chart.targetNamespace;
if (chartNamespace && !this.value.rancherResourceSetNamespace) {
this.value.rancherResourceSetNamespace = chartNamespace;
}
return { return {
storageSource, secrets: [], storageClasses: [], persistentVolumes: [] storageSource, secrets: [], storageClasses: [], persistentVolumes: []
@ -69,18 +56,6 @@ export default {
}, },
computed: { computed: {
namespaceOpts() {
const inStore = this.$store.getters['currentProduct'].inStore;
const choices = this.$store.getters[`${ inStore }/all`](NAMESPACE);
return sortBy(choices.map((obj) => {
return {
label: obj.nameDisplay,
value: obj.id,
};
}), 'label');
},
defaultStorageClass() { defaultStorageClass() {
return this.storageClasses.filter(sc => sc.metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS])[0]; return this.storageClasses.filter(sc => sc.metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS])[0];
}, },
@ -177,11 +152,6 @@ export default {
<div> <div>
<Tab label="Chart Options" name="chartOptions"> <Tab label="Chart Options" name="chartOptions">
<div class="bordered-section"> <div class="bordered-section">
<div class="row mb-10">
<div class="col span-6">
<LabeledSelect v-model="value.rancherResourceSetNamespace" :mode="mode" :label="t('backupRestoreOperator.deployment.rancherNamespace')" :options="namespaceOpts" />
</div>
</div>
<div class="row mb-10"> <div class="row mb-10">
<div class="col span-6"> <div class="col span-6">
<LabeledInput v-model="value.image.repository" :mode="mode" :label="t('backupRestoreOperator.deployment.image')" /> <LabeledInput v-model="value.image.repository" :mode="mode" :label="t('backupRestoreOperator.deployment.image')" />