fix: include all node addresses into etcd cert SANs

That was a mistake to use only 'routed' addresses, as they e.g. do not include SideroLink. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com> (cherry picked from commit 9dadc4a)
siderolabs · Sep 12, 2022 · 39c68b6 · 39c68b6
1 parent 09140a8
commit 39c68b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/app/machined/pkg/controllers/secrets/etcd.go b/internal/app/machined/pkg/controllers/secrets/etcd.go
@@ -61,7 +61,7 @@ func (ctrl *EtcdController) Inputs() []controller.Input {
 		{
 			Namespace: network.NamespaceName,
 			Type:      network.NodeAddressType,
-			ID:        pointer.To(network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s)),
+			ID:        pointer.To(network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s)),
 			Kind:      controller.InputWeak,
 		},
 	}
@@ -148,7 +148,7 @@ func (ctrl *EtcdController) Run(ctx context.Context, r controller.Runtime, logge
 			resource.NewMetadata(
 				network.NamespaceName,
 				network.NodeAddressType,
-				network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s),
+				network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s),
 				resource.VersionUndefined,
 			),
 		)

diff --git a/internal/app/machined/pkg/controllers/secrets/etcd_test.go b/internal/app/machined/pkg/controllers/secrets/etcd_test.go
@@ -65,7 +65,7 @@ func (suite *EtcdSuite) TestReconcile() {
 	hostnameStatus.TypedSpec().Domainname = "domain"
 	suite.Require().NoError(suite.State().Create(suite.Ctx(), hostnameStatus))
 
-	nodeAddresses := network.NewNodeAddress(network.NamespaceName, network.FilteredNodeAddressID(network.NodeAddressRoutedID, k8s.NodeAddressFilterNoK8s))
+	nodeAddresses := network.NewNodeAddress(network.NamespaceName, network.FilteredNodeAddressID(network.NodeAddressAccumulativeID, k8s.NodeAddressFilterNoK8s))
 	nodeAddresses.TypedSpec().Addresses = []netaddr.IPPrefix{
 		netaddr.MustParseIPPrefix("10.3.4.5/24"),
 		netaddr.MustParseIPPrefix("2001:db8::1eaf/64"),