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

Fix EKS custom vpc issue 

https://github.com/rancher/rancher/issues/15008
This commit is contained in:
loganhz 2018-08-23 14:16:08 +08:00
parent 4688f13e49
commit d5d68316d7
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
View File

@ -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');

8
lib/shared/addon/components/cluster-driver/driver-amazoneks/template.hbs
View File

@ -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"
}}