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

Address review comments

This commit is contained in:
Ciprian Hacman 2021-06-26 21:27:00 +03:00
parent 7bc629b683
commit 7969f57d07
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/awsmodel/api_loadbalancer.go
View File

@ -183,7 +183,9 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
Type: fi.String("network"), Type: fi.String("network"),
IpAddressType: fi.String("ipv4"), IpAddressType: fi.String("ipv4"),
} }
if b.UseIPv6ForAPI() { // DualStack can only be used for public NLB
// https://aws.amazon.com/premiumsupport/knowledge-center/elb-configure-with-ipv6
if b.UseIPv6ForAPI() && lbSpec.Type == kops.LoadBalancerTypePublic {
nlb.IpAddressType = fi.String("dualstack") nlb.IpAddressType = fi.String("dualstack")
} }

1
pkg/model/awsmodel/bastion.go
View File

@ -298,6 +298,7 @@ func (b *BastionModelBuilder) Build(c *fi.ModelBuilderContext) error {
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Zone: b.LinkToDNSZone(), Zone: b.LinkToDNSZone(),
ResourceName: fi.String(bastionPublicName),
ResourceType: fi.String("A"), ResourceType: fi.String("A"),
TargetLoadBalancer: elb, TargetLoadBalancer: elb,
} }

26
pkg/model/awsmodel/dns.go
View File

@ -143,16 +143,21 @@ func (b *DNSModelBuilder) Build(c *fi.ModelBuilderContext) error {
} }
// Using EnsureTask as MasterInternalName and MasterPublicName could be the same // Using EnsureTask as MasterInternalName and MasterPublicName could be the same
c.EnsureTask(&awstasks.DNSName{ {
Name: fi.String(b.Cluster.Spec.MasterInternalName), err := c.EnsureTask(&awstasks.DNSName{
ResourceName: fi.String(b.Cluster.Spec.MasterInternalName), Name: fi.String(b.Cluster.Spec.MasterInternalName),
Lifecycle: b.Lifecycle, ResourceName: fi.String(b.Cluster.Spec.MasterInternalName),
Zone: b.LinkToDNSZone(), Lifecycle: b.Lifecycle,
ResourceType: fi.String("A"), Zone: b.LinkToDNSZone(),
TargetLoadBalancer: targetLoadBalancer, ResourceType: fi.String("A"),
}) TargetLoadBalancer: targetLoadBalancer,
})
if err != nil {
return err
}
}
if b.UseIPv6ForAPI() { if b.UseIPv6ForAPI() {
c.EnsureTask(&awstasks.DNSName{ err := c.EnsureTask(&awstasks.DNSName{
Name: fi.String(b.Cluster.Spec.MasterInternalName + "-AAAA"), Name: fi.String(b.Cluster.Spec.MasterInternalName + "-AAAA"),
ResourceName: fi.String(b.Cluster.Spec.MasterInternalName), ResourceName: fi.String(b.Cluster.Spec.MasterInternalName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
@ -160,6 +165,9 @@ func (b *DNSModelBuilder) Build(c *fi.ModelBuilderContext) error {
ResourceType: fi.String("AAAA"), ResourceType: fi.String("AAAA"),
TargetLoadBalancer: targetLoadBalancer, TargetLoadBalancer: targetLoadBalancer,
}) })
if err != nil {
return err
}
} }
} }
} }

11
upup/pkg/fi/cloudup/awstasks/dnsname.go
View File

@ -198,9 +198,18 @@ func (e *DNSName) Run(c *fi.Context) error {
func (s *DNSName) CheckChanges(a, e, changes *DNSName) error { func (s *DNSName) CheckChanges(a, e, changes *DNSName) error {
if a == nil { if a == nil {
if fi.StringValue(e.ResourceName) == "" { if fi.StringValue(e.Name) == "" {
return fi.RequiredField("Name") return fi.RequiredField("Name")
} }
if fi.StringValue(e.ResourceName) == "" {
return fi.RequiredField("ResourceName")
}
if fi.StringValue(e.ResourceType) == "" {
return fi.RequiredField("ResourceType")
}
if e.Zone == nil {
return fi.RequiredField("Zone")
}
} }
return nil return nil
} }