Merge pull request #1412 from HotelsDotCom/issue-etcd-dependency-installing-0.10.1

Resolve CFN dependency issue when updating to v0.10.x

Author: mumoshu

core/controlplane/config/templates/stack-template.json

@@ -1877,7 +1877,6 @@
     },
     {{end}}
     {{end}}
-    {{if not .Kubernetes.Networking.SelfHosting.Enabled }}
     {{range $index, $etcdInstance := $.EtcdNodes}}
     {{if $etcdInstance.EIPManaged}}
     "{{$etcdInstance.EIPLogicalName}}": {
@@ -1894,7 +1893,6 @@
     },
     {{end}}
     {{end}}
-    {{end}}
     {{ if not .Controller.IAMConfig.InstanceProfile.Arn }}
     "ControllerIAMRoleArn": {
       "Description": "The ARN of the IAM role for Controllers",