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

Merge pull request #2312 from codyrancher/pod-scheduling 

Fixing two issues that showed up in pod scheduling
This commit is contained in:
codyrancher 2021-02-11 11:44:42 -07:00 committed by GitHub
parent 7fa2b8760f fc9eef90fb
commit 33f6763dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/form/LabeledSelect.vue
View File

@ -249,7 +249,6 @@ export default {
:searchable="isSearchable" :searchable="isSearchable"
:selectable="selectable" :selectable="selectable"
:value="value != null ? value : ''" :value="value != null ? value : ''"
@input="(e) => $emit('input', e)"
v-on="$listeners" v-on="$listeners"
@search:blur="onBlur" @search:blur="onBlur"
@search:focus="onFocus" @search:focus="onFocus"

13
components/form/PodAffinity.vue
View File

@ -1,6 +1,6 @@
<script> <script>
import { _VIEW } from '@/config/query-params'; import { _VIEW } from '@/config/query-params';
import { get, isEmpty, clone } from '@/utils/object'; import { get, set, isEmpty, clone } from '@/utils/object';
import { POD, NODE, NAMESPACE } from '@/config/types'; import { POD, NODE, NAMESPACE } from '@/config/types';
import MatchExpressions from '@/components/form/MatchExpressions'; import MatchExpressions from '@/components/form/MatchExpressions';
import LabeledSelect from '@/components/form/LabeledSelect'; import LabeledSelect from '@/components/form/LabeledSelect';
@ -141,7 +141,8 @@ export default {
} else { } else {
term.weight = 1; term.weight = 1;
} }
this.$set(this.allSelectorTerms, idx, term);
this.$set(this.allSelectorTerms, idx, clone(term));
this.queueUpdate(); this.queueUpdate();
}, },
@ -164,6 +165,7 @@ export default {
isEmpty, isEmpty,
get, get,
set
} }
}; };
@ -186,11 +188,12 @@ export default {
</div> </div>
<div class="col span-6"> <div class="col span-6">
<LabeledSelect <LabeledSelect
:key="priorityDisplay(props.row.value)"
:mode="mode" :mode="mode"
:options="[t('workload.scheduling.affinity.preferred'),t('workload.scheduling.affinity.required')]" :options="[t('workload.scheduling.affinity.preferred'),t('workload.scheduling.affinity.required')]"
:value="priorityDisplay(props.row.value)" :value="priorityDisplay(props.row.value)"
:label="t('workload.scheduling.affinity.priority')" :label="t('workload.scheduling.affinity.priority')"
@input="changePriority(props.row.value, idx)" @input="changePriority(props.row.value, props.i)"
/> />
</div> </div>
</div> </div>
@ -201,7 +204,7 @@ export default {
:name="`namespaces-${props.row.value._id}`" :name="`namespaces-${props.row.value._id}`"
:mode="mode" :mode="mode"
:value="!!props.row.value.namespaces" :value="!!props.row.value.namespaces"
@input="changeNamespaceMode(props.row.value, idx)" @input="changeNamespaceMode(props.row.value, props.i)"
/> />
</div> </div>
<div class="spacer"></div> <div class="spacer"></div>
@ -221,7 +224,7 @@ export default {
:type="pod" :type="pod"
:value="get(props.row.value, 'labelSelector.matchExpressions')" :value="get(props.row.value, 'labelSelector.matchExpressions')"
:show-remove="false" :show-remove="false"
@input="e=>$set(props.row.value.labelSelector, 'matchExpressions', e)" @input="e=>set(props.row.value, 'labelSelector.matchExpressions', e)"
/> />
<div class="spacer"></div> <div class="spacer"></div>
<div class="row"> <div class="row">