From 0afdfbc2008fc1dba9ee18e20c3ba028cad1c49c Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Mon, 21 Sep 2020 14:09:13 -0700
Subject: [PATCH] Update session affinity checks to use ClientIp

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

rancher/dashboard#1305
---
 assets/translations/en-us.yaml |  2 +-
 edit/service.vue               | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml
index 3c32c9f01e..7a75522fff 100644
--- a/assets/translations/en-us.yaml
+++ b/assets/translations/en-us.yaml
@@ -995,7 +995,7 @@ servicesPage:
     label: Labels & Annotations
   affinity:
     actionLabels:
-      clusterIp: ClusterIP
+      clientIp: ClientIP
       none: There is no session affinity configured.
     helpText: Map connections to a consistent target based on their source IP.
     label: Session Affinity
diff --git a/edit/service.vue b/edit/service.vue
index 27cd624a15..7eead4e4f4 100644
--- a/edit/service.vue
+++ b/edit/service.vue
@@ -18,13 +18,13 @@ import Banner from '@/components/Banner';
 import Labels from '@/components/form/Labels';
 
 const SESSION_AFFINITY_ACTION_VALUES = {
-  NONE:      'None',
-  CLUSTERIP: 'ClientIP'
+  NONE:     'None',
+  CLIENTIP: 'ClientIP'
 };
 
 const SESSION_AFFINITY_ACTION_LABELS = {
-  NONE:      'servicesPage.affinity.actionLabels.none',
-  CLUSTERIP: 'servicesPage.affinity.actionLabels.clusterIp'
+  NONE:     'servicesPage.affinity.actionLabels.none',
+  CLIENTIP: 'servicesPage.affinity.actionLabels.clientIp'
 };
 
 const SESSION_STICKY_TIME_DEFAULT = 10800;
@@ -107,12 +107,15 @@ export default {
           this.$set(this.value.spec, 'type', serviceType);
         }
       }
-    }
+    },
+    showAffinityTimeout() {
+      return this.value.spec.sessionAffinity === 'ClientIP' && !isEmpty(this.value.spec.sessionAffinityConfig);
+    },
   },
 
   watch: {
     'value.spec.sessionAffinity'(val) {
-      if (val === CLUSTERIP) {
+      if (val === 'ClientIP') {
         this.value.spec.sessionAffinityConfig = { clientIP: { timeoutSeconds: null } };
 
         // set it null and then set it with vue to make reactive.
@@ -304,7 +307,7 @@ export default {
               :mode="mode"
             />
           </div>
-          <div v-if="value.spec.sessionAffinity === 'ClientIP'" class="col span-6">
+          <div v-if="showAffinityTimeout" class="col span-6">
             <UnitInput
               v-model="value.spec.sessionAffinityConfig.clientIP.timeoutSeconds"
               :suffix="t('suffix.seconds')"