From 010f8a9e74037e633def103d84e03c602df1dc34 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Thu, 30 Jul 2020 10:05:05 -0700 Subject: [PATCH] Always use eksStatus for security groups rancher/rancher#28148 --- .../cluster-driver/driver-eks/template.hbs | 14 ++++++++++---- translations/en-us.yaml | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-eks/template.hbs b/lib/shared/addon/components/cluster-driver/driver-eks/template.hbs index 998526627..8174212af 100644 --- a/lib/shared/addon/components/cluster-driver/driver-eks/template.hbs +++ b/lib/shared/addon/components/cluster-driver/driver-eks/template.hbs @@ -329,6 +329,10 @@
{{sub}}
+ {{else}} +
+ {{t "clusterNew.amazoneks.subnet.noneSelected"}} +
{{/each}} {{/if}} @@ -338,7 +342,10 @@ {{#if (eq step 3)}} {{/each}} - {{else if - (or config.securityGroups primaryResource.eksStatus.securityGroups)}} - {{#each config.securityGroups as |sg|}} + {{else}} + {{#each primaryResource.eksStatus.securityGroups as |sg|}}
{{sg}}
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 366a87c32..1a33d15ca 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -3407,6 +3407,7 @@ clusterNew: help: EKS requires at least 2 subnets. Subnets should span at least 2 availability zones. next: "Next: Select Security Group" loading: "Loading Security Groups from Amazon..." + noneSelected: "Rancher created VPC, Subnet, and Securty Group" associateWorkerNodePublicIp: title: Public IP for Worker Nodes radio: