-
Notifications
You must be signed in to change notification settings - Fork 575
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: include Kubernetes controlplane endpoint as one of the endpoints
These endpoints are used for workers to find the addresses of the controlplane nodes to connect to `trustd` to issue certificates of `apid`. These endpoints today come from two sources: * discovery service data * Kubernetes API server endpoints This PR adds to the list static entry based on the Kubernetes control plane endpoint in the machine config. E.g. if the loadbalancer is used for the controlplane endpoint, and that loadbalancer also proxies requests for port 50001 (trustd), this static endpoint will provide workers with connectivity to trustd even if the discovery service is disabled, and Kubernetes API is not up. If this endpoint doesn't provide any trustd API, Talos will still try other endpoints. Talos does server certificate validation when calling trustd, so including malicious endpoints doesn't cause any harm, as malicious endpoint can't provider proper server certificate. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com> (cherry picked from commit 80fed31)
- Loading branch information
Showing
5 changed files
with
184 additions
and
1 deletion.
There are no files selected for viewing
92 changes: 92 additions & 0 deletions
92
internal/app/machined/pkg/controllers/k8s/static_endpoint.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
// This Source Code Form is subject to the terms of the Mozilla Public | ||
// License, v. 2.0. If a copy of the MPL was not distributed with this | ||
// file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
package k8s | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"net" | ||
"net/netip" | ||
|
||
"github.com/cosi-project/runtime/pkg/controller" | ||
"github.com/cosi-project/runtime/pkg/resource" | ||
"github.com/cosi-project/runtime/pkg/safe" | ||
"github.com/cosi-project/runtime/pkg/state" | ||
"github.com/siderolabs/gen/slices" | ||
"github.com/siderolabs/go-pointer" | ||
"go.uber.org/zap" | ||
|
||
"github.com/siderolabs/talos/pkg/machinery/resources/config" | ||
"github.com/siderolabs/talos/pkg/machinery/resources/k8s" | ||
) | ||
|
||
// StaticEndpointController injects endpoints based on machine configuration. | ||
type StaticEndpointController struct{} | ||
|
||
// Name implements controller.Controller interface. | ||
func (ctrl *StaticEndpointController) Name() string { | ||
return "k8s.StaticEndpointController" | ||
} | ||
|
||
// Inputs implements controller.Controller interface. | ||
func (ctrl *StaticEndpointController) Inputs() []controller.Input { | ||
return []controller.Input{ | ||
{ | ||
Namespace: config.NamespaceName, | ||
Type: config.MachineConfigType, | ||
ID: pointer.To(config.V1Alpha1ID), | ||
Kind: controller.InputWeak, | ||
}, | ||
} | ||
} | ||
|
||
// Outputs implements controller.Controller interface. | ||
func (ctrl *StaticEndpointController) Outputs() []controller.Output { | ||
return []controller.Output{ | ||
{ | ||
Type: k8s.EndpointType, | ||
Kind: controller.OutputShared, | ||
}, | ||
} | ||
} | ||
|
||
// Run implements controller.Controller interface. | ||
func (ctrl *StaticEndpointController) Run(ctx context.Context, r controller.Runtime, logger *zap.Logger) error { | ||
for { | ||
select { | ||
case <-ctx.Done(): | ||
return nil | ||
case <-r.EventCh(): | ||
} | ||
|
||
machineConfig, err := safe.ReaderGet[*config.MachineConfig](ctx, r, resource.NewMetadata(config.NamespaceName, config.MachineConfigType, config.V1Alpha1ID, resource.VersionUndefined)) | ||
if err != nil { | ||
if state.IsNotFoundError(err) { | ||
continue | ||
} | ||
|
||
return fmt.Errorf("error getting machine config: %w", err) | ||
} | ||
|
||
cpHostname := machineConfig.Config().Cluster().Endpoint().Hostname() | ||
|
||
var resolver net.Resolver | ||
|
||
addrs, err := resolver.LookupNetIP(ctx, "ip", cpHostname) | ||
if err != nil { | ||
return fmt.Errorf("error resolving %q: %w", cpHostname, err) | ||
} | ||
|
||
addrs = slices.Map(addrs, netip.Addr.Unmap) | ||
|
||
if err = safe.WriterModify(ctx, r, k8s.NewEndpoint(k8s.ControlPlaneNamespaceName, k8s.ControlPlaneKubernetesEndpointsID), func(endpoint *k8s.Endpoint) error { | ||
endpoint.TypedSpec().Addresses = addrs | ||
|
||
return nil | ||
}); err != nil { | ||
return fmt.Errorf("error modifying endpoint: %w", err) | ||
} | ||
} | ||
} |
62 changes: 62 additions & 0 deletions
62
internal/app/machined/pkg/controllers/k8s/static_endpoint_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// This Source Code Form is subject to the terms of the Mozilla Public | ||
// License, v. 2.0. If a copy of the MPL was not distributed with this | ||
// file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
package k8s_test | ||
|
||
import ( | ||
"net/netip" | ||
"net/url" | ||
"testing" | ||
|
||
"github.com/cosi-project/runtime/pkg/resource" | ||
"github.com/cosi-project/runtime/pkg/resource/rtestutils" | ||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/suite" | ||
|
||
"github.com/siderolabs/talos/internal/app/machined/pkg/controllers/ctest" | ||
k8sctrl "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/k8s" | ||
"github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1" | ||
"github.com/siderolabs/talos/pkg/machinery/resources/config" | ||
"github.com/siderolabs/talos/pkg/machinery/resources/k8s" | ||
) | ||
|
||
type StaticEndpointControllerSuite struct { | ||
ctest.DefaultSuite | ||
} | ||
|
||
func (suite *StaticEndpointControllerSuite) TestReconcile() { | ||
u, err := url.Parse("https://[2001:db8::1]:6443/") | ||
suite.Require().NoError(err) | ||
|
||
cfg := config.NewMachineConfig( | ||
&v1alpha1.Config{ | ||
ConfigVersion: "v1alpha1", | ||
MachineConfig: &v1alpha1.MachineConfig{}, | ||
ClusterConfig: &v1alpha1.ClusterConfig{ | ||
ControlPlane: &v1alpha1.ControlPlaneConfig{ | ||
Endpoint: &v1alpha1.Endpoint{ | ||
URL: u, | ||
}, | ||
}, | ||
}, | ||
}, | ||
) | ||
|
||
suite.Require().NoError(suite.State().Create(suite.Ctx(), cfg)) | ||
|
||
rtestutils.AssertResources(suite.Ctx(), suite.T(), suite.State(), []resource.ID{k8s.ControlPlaneKubernetesEndpointsID}, | ||
func(endpoint *k8s.Endpoint, assert *assert.Assertions) { | ||
assert.Equal([]netip.Addr{netip.MustParseAddr("2001:db8::1")}, endpoint.TypedSpec().Addresses) | ||
}) | ||
} | ||
|
||
func TestStaticEndpointControllerSuite(t *testing.T) { | ||
suite.Run(t, &StaticEndpointControllerSuite{ | ||
DefaultSuite: ctest.DefaultSuite{ | ||
AfterSetup: func(suite *ctest.DefaultSuite) { | ||
suite.Require().NoError(suite.Runtime().RegisterController(&k8sctrl.StaticEndpointController{})) | ||
}, | ||
}, | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters