Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

[v0.16.x] Fix etcd certificates when using private zones #1893

Merged
merged 2 commits into from
Aug 18, 2020
+13 −8
Merged

[v0.16.x] Fix etcd certificates when using private zones #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da5598d
Add compute.internal to etcd san when using private zones, because th…
dominicgunn Aug 1, 2020
5720dae
Fix tests
dominicgunn Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/model/etcd_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ func (c EtcdCluster) DNSNames() []string {
dnsName = fmt.Sprintf("*.%s", c.region.PrivateDomainName())
}
}

privateDomainSan := fmt.Sprintf("*.%s", c.region.PrivateDomainName())
if dnsName != privateDomainSan && c.GetMemberIdentityProvider() == api.MemberIdentityProviderENI {
return []string{dnsName, privateDomainSan}
}
return []string{dnsName}
}

Expand Down
16 changes: 8 additions & 8 deletions pkg/model/etcd_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ func TestEtcdClusterDNSNames(t *testing.T) {
actual := cluster.DNSNames()
expected := []string{"*.ec2.internal"}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
t.Errorf("invalid dns names: expected=%v, got=%v", expected, actual)
}
})
t.Run("us-west-1", func(t *testing.T) {
cluster := NewEtcdCluster(config, usWest1, etcdNet, etcdCount)
actual := cluster.DNSNames()
expected := []string{"*.us-west-1.compute.internal"}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
t.Errorf("invalid dns names: expected=%v, got=%v", expected, actual)
}
})
})
Expand All @@ -42,17 +42,17 @@ func TestEtcdClusterDNSNames(t *testing.T) {
t.Run("us-east-1", func(t *testing.T) {
cluster := NewEtcdCluster(config, usEast1, etcdNet, etcdCount)
actual := cluster.DNSNames()
expected := []string{"*.internal.example.com"}
expected := []string{"*.internal.example.com", "*.ec2.internal"}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
t.Errorf("invalid dns names: expected=%v, got=%v", expected, actual)
}
})
t.Run("us-west-1", func(t *testing.T) {
cluster := NewEtcdCluster(config, usWest1, etcdNet, etcdCount)
actual := cluster.DNSNames()
expected := []string{"*.internal.example.com"}
expected := []string{"*.internal.example.com", "*.us-west-1.compute.internal"}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
t.Errorf("invalid dns names: expected=%v, got=%v", expected, actual)
}
})
})
Expand All @@ -67,15 +67,15 @@ func TestEtcdClusterDNSNames(t *testing.T) {
actual := cluster.DNSNames()
expected := []string{"*.compute-1.amazonaws.com"}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
t.Errorf("invalid dns names: expected=%v, got=%v", expected, actual)
}
})
t.Run("us-west-1", func(t *testing.T) {
cluster := NewEtcdCluster(config, usWest1, etcdNet, etcdCount)
actual := cluster.DNSNames()
expected := []string{"*.us-west-1.compute.amazonaws.com"}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
t.Errorf("invalid dns names: expected=%v, got=%v", expected, actual)
}
})
})
Expand Down