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

Update session affinity checks to use ClientIp 

rather than ClusterIP. The check seems to have been conflated between ClusterIp & ClientIp

rancher/dashboard#1305
This commit is contained in:
Westly Wright 2020-09-21 14:09:13 -07:00
parent d6d43bfdce
commit 0afdfbc200
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/translations/en-us.yaml
View File

@ -995,7 +995,7 @@ servicesPage:
label: Labels & Annotations label: Labels & Annotations
affinity: affinity:
actionLabels: actionLabels:
clusterIp: ClusterIP clientIp: ClientIP
none: There is no session affinity configured. none: There is no session affinity configured.
helpText: Map connections to a consistent target based on their source IP. helpText: Map connections to a consistent target based on their source IP.
label: Session Affinity label: Session Affinity

13
edit/service.vue
View File

@ -19,12 +19,12 @@ import Labels from '@/components/form/Labels';
const SESSION_AFFINITY_ACTION_VALUES = { const SESSION_AFFINITY_ACTION_VALUES = {
NONE: 'None', NONE: 'None',
CLUSTERIP: 'ClientIP' CLIENTIP: 'ClientIP'
}; };
const SESSION_AFFINITY_ACTION_LABELS = { const SESSION_AFFINITY_ACTION_LABELS = {
NONE: 'servicesPage.affinity.actionLabels.none', NONE: 'servicesPage.affinity.actionLabels.none',
CLUSTERIP: 'servicesPage.affinity.actionLabels.clusterIp' CLIENTIP: 'servicesPage.affinity.actionLabels.clientIp'
}; };
const SESSION_STICKY_TIME_DEFAULT = 10800; const SESSION_STICKY_TIME_DEFAULT = 10800;
@ -107,12 +107,15 @@ export default {
this.$set(this.value.spec, 'type', serviceType); this.$set(this.value.spec, 'type', serviceType);
} }
} }
} },
showAffinityTimeout() {
return this.value.spec.sessionAffinity === 'ClientIP' && !isEmpty(this.value.spec.sessionAffinityConfig);
},
}, },
watch: { watch: {
'value.spec.sessionAffinity'(val) { 'value.spec.sessionAffinity'(val) {
if (val === CLUSTERIP) { if (val === 'ClientIP') {
this.value.spec.sessionAffinityConfig = { clientIP: { timeoutSeconds: null } }; this.value.spec.sessionAffinityConfig = { clientIP: { timeoutSeconds: null } };
// set it null and then set it with vue to make reactive. // set it null and then set it with vue to make reactive.
@ -304,7 +307,7 @@ export default {
:mode="mode" :mode="mode"
/> />
</div> </div>
<div v-if="value.spec.sessionAffinity === 'ClientIP'" class="col span-6"> <div v-if="showAffinityTimeout" class="col span-6">
<UnitInput <UnitInput
v-model="value.spec.sessionAffinityConfig.clientIP.timeoutSeconds" v-model="value.spec.sessionAffinityConfig.clientIP.timeoutSeconds"
:suffix="t('suffix.seconds')" :suffix="t('suffix.seconds')"