From d5d68316d760fc1cdfc2bbaf83dcd6c31676f043 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Thu, 23 Aug 2018 14:16:08 +0800
Subject: [PATCH] Fix EKS custom vpc issue

https://github.com/rancher/rancher/issues/15008
---
 .../driver-amazoneks/component.js             | 26 +++++++++++++++++++
 .../driver-amazoneks/template.hbs             |  8 +++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js b/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
index e03a0ff5c..88986c116 100644
--- a/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
@@ -199,6 +199,32 @@ export default Component.extend(ClusterDriver, {
     },
   },
 
+  vpcSubnetModeDidChange: observer('vpcSubnetMode', function() {
+    const mode = get(this, 'vpcSubnetMode');
+
+    if ( mode === 'custom' ) {
+      const vpc = get(this, 'filteredVpcs.firstObject.id');
+
+      if ( vpc ) {
+        set(this, 'config.virtualNetwork', vpc);
+      }
+    }
+  }),
+
+  serviceRoleModeDidChange: observer('serviceRoleMode', function() {
+    const mode = get(this, 'serviceRoleMode');
+
+    if ( mode === 'custom' ) {
+      const role = get(this, 'serviceRoles.firstObject.RoleId');
+
+      if ( role ) {
+        set(this, 'selectedServiceRole', role);
+      }
+    } else {
+      set(this, 'selectedServiceRole', null);
+    }
+  }),
+
   vpcsChanged: observer('config.virtualNetwork', 'vpcSubnetMode', function() {
     const vnet = get(this, 'config.virtualNetwork');
     const mode = get(this, 'vpcSubnetMode');
diff --git a/lib/shared/addon/components/cluster-driver/driver-amazoneks/template.hbs b/lib/shared/addon/components/cluster-driver/driver-amazoneks/template.hbs
index aa1388419..a62dc75cc 100644
--- a/lib/shared/addon/components/cluster-driver/driver-amazoneks/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-amazoneks/template.hbs
@@ -192,7 +192,7 @@
             editing=(eq mode 'edit')
             saveDisabled=canSaveVPC
             save="setVPCS"
-            cancel="cancel"
+            cancel=close
             createLabel="nodeDriver.amazoneks.vpc.nextRancherDefault"
             savingLabel="nodeDriver.amazoneks.vpc.loadingRancherDefault"
         }}
@@ -201,7 +201,7 @@
             editing=(eq mode 'edit')
             saveDisabled=canSaveVPC
             save="setVPCS"
-            cancel="cancel"
+            cancel=close
             createLabel="nodeDriver.amazoneks.vpc.next"
             savingLabel="nodeDriver.amazoneks.vpc.loading"
         }}
@@ -213,7 +213,7 @@
           editing=(eq mode 'edit')
           saveDisabled=(lte config.subnets.length 0)
           save="setSubnets"
-          cancel="cancel"
+          cancel=close
           createLabel="nodeDriver.amazoneks.subnet.next"
           savingLabel="nodeDriver.amazoneks.subnet.loading"
       }}
@@ -251,7 +251,7 @@
           editing=(eq mode 'edit')
           saveDisabled=canSaveSG
           save=(action (mut step) 6)
-          cancel="cancel"
+          cancel=close
           createLabel="nodeDriver.amazonec2.securityGroup.next"
           savingLabel="nodeDriver.amazonec2.securityGroup.loading"
       }}