Skip to content

Commit 725ecb0

Browse files
committed
Update talos v1.9.1
1 parent 8ed658a commit 725ecb0

606 files changed

Lines changed: 29070 additions & 8896 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go.mod‎

Lines changed: 184 additions & 175 deletions
Large diffs are not rendered by default.

‎go.sum‎

Lines changed: 403 additions & 418 deletions
Large diffs are not rendered by default.

‎internal/app/apid/main.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313
"fmt"
1414
"log"
1515
"os/signal"
16-
"reflect"
1716
"regexp"
17+
"slices"
1818
"syscall"
1919
"time"
2020

2121
"github.com/cosi-project/runtime/api/v1alpha1"
2222
"github.com/cosi-project/runtime/pkg/state"
2323
"github.com/cosi-project/runtime/pkg/state/protobuf/client"
24-
debug "github.com/siderolabs/go-debug"
24+
"github.com/siderolabs/go-debug"
2525
"github.com/siderolabs/grpc-proxy/proxy"
2626
"golang.org/x/sync/errgroup"
2727
"google.golang.org/grpc"
@@ -31,6 +31,7 @@ import (
3131
apidbackend "github.com/aenix-io/talm/internal/app/apid/pkg/backend"
3232
"github.com/aenix-io/talm/internal/app/apid/pkg/director"
3333
"github.com/aenix-io/talm/internal/app/apid/pkg/provider"
34+
"github.com/aenix-io/talm/internal/pkg/selinux"
3435
"github.com/siderolabs/talos/pkg/grpc/factory"
3536
"github.com/siderolabs/talos/pkg/grpc/middleware/authz"
3637
"github.com/siderolabs/talos/pkg/grpc/proxy/backend"
@@ -73,7 +74,7 @@ func apidMain() error {
7374

7475
startup.LimitMaxProcs(constants.ApidMaxProcs)
7576

76-
runtimeConn, err := grpc.Dial("unix://"+constants.APIRuntimeSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()))
77+
runtimeConn, err := grpc.NewClient("unix://"+constants.APIRuntimeSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()))
7778
if err != nil {
7879
return fmt.Errorf("failed to dial runtime connection: %w", err)
7980
}
@@ -157,6 +158,10 @@ func apidMain() error {
157158
return fmt.Errorf("error creating listner: %w", err)
158159
}
159160

161+
if err = selinux.SetLabel(constants.APISocketPath, constants.APISocketLabel); err != nil {
162+
return err
163+
}
164+
160165
networkServer := func() *grpc.Server {
161166
mode := authz.Disabled
162167
if *rbacEnabled {
@@ -178,7 +183,7 @@ func apidMain() error {
178183
grpc.Creds(
179184
credentials.NewTLS(serverTLSConfig),
180185
),
181-
grpc.CustomCodec(proxy.Codec()), //nolint:staticcheck
186+
grpc.ForceServerCodecV2(proxy.Codec()),
182187
grpc.UnknownServiceHandler(
183188
proxy.TransparentHandler(
184189
router.Director,
@@ -205,7 +210,7 @@ func apidMain() error {
205210
router,
206211
factory.WithDefaultLog(),
207212
factory.ServerOptions(
208-
grpc.CustomCodec(proxy.Codec()), //nolint:staticcheck
213+
grpc.ForceServerCodecV2(proxy.Codec()),
209214
grpc.UnknownServiceHandler(
210215
proxy.TransparentHandler(
211216
router.Director,
@@ -248,7 +253,7 @@ func apidMain() error {
248253
return errGroup.Wait()
249254
}
250255

251-
func verifyExtKeyUsage(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
256+
func verifyExtKeyUsage(_ [][]byte, verifiedChains [][]*x509.Certificate) error {
252257
if len(verifiedChains) == 0 {
253258
return errors.New("no verified chains")
254259
}
@@ -260,7 +265,7 @@ func verifyExtKeyUsage(rawCerts [][]byte, verifiedChains [][]*x509.Certificate)
260265
continue
261266
}
262267

263-
if !reflect.DeepEqual(cert.ExtKeyUsage, []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}) {
268+
if !slices.Equal(cert.ExtKeyUsage, []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}) {
264269
return fmt.Errorf("certificate %q is missing the client auth extended key usage", cert.Subject)
265270
}
266271
}

‎internal/app/apid/pkg/backend/apid.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"context"
99
"crypto/tls"
1010
"fmt"
11+
"slices"
1112
"sync"
1213
"time"
1314

@@ -66,7 +67,7 @@ func (a *APID) String() string {
6667
}
6768

6869
// GetConnection returns a grpc connection to the backend.
69-
func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (context.Context, *grpc.ClientConn, error) {
70+
func (a *APID) GetConnection(ctx context.Context, _ string) (context.Context, *grpc.ClientConn, error) {
7071
md, _ := metadata.FromIncomingContext(ctx)
7172
md = md.Copy()
7273

@@ -103,7 +104,7 @@ func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (contex
103104
backoffConfig := backoff.DefaultConfig
104105
backoffConfig.MaxDelay = 15 * time.Second
105106

106-
a.conn, err = grpc.Dial(
107+
a.conn, err = grpc.NewClient(
107108
fmt.Sprintf("%s:%d", net.FormatAddress(a.target), constants.ApidPort),
108109
grpc.WithInitialWindowSize(65535*32),
109110
grpc.WithInitialConnWindowSize(65535*16),
@@ -117,8 +118,8 @@ func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (contex
117118
}),
118119
grpc.WithDefaultCallOptions(
119120
grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize),
121+
grpc.ForceCodecV2(proxy.Codec()),
120122
),
121-
grpc.WithCodec(proxy.Codec()), //nolint:staticcheck
122123
grpc.WithSharedWriteBuffer(true),
123124
)
124125

@@ -212,9 +213,8 @@ func (a *APID) AppendInfo(streaming bool, resp []byte) ([]byte, error) {
212213
protowire.AppendVarint(nil, (metadataField<<3)|metadataType),
213214
uint64(len(resp)+len(payload)),
214215
)
215-
resp = append(prefix, resp...)
216216

217-
return append(resp, payload...), err
217+
return slices.Concat(prefix, resp, payload), err
218218
}
219219

220220
// BuildError is called to convert error from upstream into response field.

‎internal/app/apid/pkg/backend/apid_factory.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ package backend
77
import (
88
"crypto/tls"
99

10-
"github.com/siderolabs/gen/containers"
10+
"github.com/siderolabs/gen/concurrent"
1111
"github.com/siderolabs/grpc-proxy/proxy"
1212
)
1313

1414
// APIDFactory caches connection to apid instances by target.
1515
//
1616
// TODO: need to clean up idle connections from time to time.
1717
type APIDFactory struct {
18-
cache containers.SyncMap[string, *APID]
18+
cache *concurrent.HashTrieMap[string, *APID]
1919
provider TLSConfigProvider
2020
}
2121

@@ -29,6 +29,7 @@ type TLSConfigProvider interface {
2929
// Client TLS config is used to connect to other apid instances.
3030
func NewAPIDFactory(provider TLSConfigProvider) *APIDFactory {
3131
return &APIDFactory{
32+
cache: concurrent.NewHashTrieMap[string, *APID](),
3233
provider: provider,
3334
}
3435
}
@@ -62,7 +63,7 @@ func (factory *APIDFactory) Get(target string) (proxy.Backend, error) {
6263
//
6364
// This ensures that all connections are closed.
6465
func (factory *APIDFactory) Flush() {
65-
factory.cache.Range(func(key string, backend *APID) bool {
66+
factory.cache.Enumerate(func(key string, backend *APID) bool {
6667
backend.Close()
6768

6869
return true

‎internal/app/apid/pkg/backend/apid_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func TestAPIIdiosyncrasies(t *testing.T) {
260260
}
261261
}
262262

263-
//nolint:nakedret,gocyclo,errcheck,forcetypeassert
263+
//nolint:nakedret,gocyclo,forcetypeassert
264264
func getOptions(t *testing.T, descriptor protoreflect.Descriptor) (deprecated bool, version string) {
265265
switch opts := descriptor.Options().(type) {
266266
case *descriptorpb.EnumOptions:

‎internal/app/apid/pkg/provider/provider.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func NewTLSConfig(ctx context.Context, resources state.State) (*TLSConfig, error
5858
return nil, fmt.Errorf("error watching for API certificates: %w", event.Error)
5959
}
6060

61-
apiCerts := event.Resource.(*secrets.API) //nolint:errcheck,forcetypeassert
61+
apiCerts := event.Resource.(*secrets.API) //nolint:forcetypeassert
6262

6363
if err := provider.Update(apiCerts); err != nil {
6464
return nil, err
@@ -92,7 +92,7 @@ func (tlsConfig *TLSConfig) Watch(ctx context.Context, onUpdate func()) error {
9292
return fmt.Errorf("error watching API certificates: %w", event.Error)
9393
}
9494

95-
apiCerts := event.Resource.(*secrets.API) //nolint:errcheck,forcetypeassert
95+
apiCerts := event.Resource.(*secrets.API) //nolint:forcetypeassert
9696

9797
if err := tlsConfig.certificateProvider.Update(apiCerts); err != nil {
9898
return fmt.Errorf("failed updating cert: %v", err)
@@ -193,7 +193,7 @@ func (p *certificateProvider) GetCACertPool() (*stdx509.CertPool, error) {
193193
return p.caCertPool, nil
194194
}
195195

196-
func (p *certificateProvider) GetCertificate(h *stdlibtls.ClientHelloInfo) (*stdlibtls.Certificate, error) {
196+
func (p *certificateProvider) GetCertificate(*stdlibtls.ClientHelloInfo) (*stdlibtls.Certificate, error) {
197197
p.mu.Lock()
198198
defer p.mu.Unlock()
199199

‎internal/app/auditd/auditd.go‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
// Package auditd registers auditd service and logs audit events.
6+
package auditd
7+
8+
import (
9+
"context"
10+
"errors"
11+
"fmt"
12+
"io"
13+
"sync"
14+
"sync/atomic"
15+
"syscall"
16+
17+
"github.com/elastic/go-libaudit/v2"
18+
"github.com/elastic/go-libaudit/v2/auparse"
19+
20+
"github.com/aenix-io/talm/internal/app/machined/pkg/runtime"
21+
)
22+
23+
// Main is an entrypoint to the auditd service.
24+
func Main(ctx context.Context, _ runtime.Runtime, logWriter io.Writer) error {
25+
return Run(ctx, logWriter)
26+
}
27+
28+
// Run starts the auditd service.
29+
//
30+
// based on https://github.com/elastic/go-libaudit/blob/main/cmd/audit/audit.go
31+
func Run(ctx context.Context, logWriter io.Writer) error {
32+
var wg sync.WaitGroup
33+
34+
defer wg.Wait()
35+
36+
ctx, cancel := context.WithCancel(ctx)
37+
defer cancel()
38+
39+
client, err := libaudit.NewAuditClient(nil)
40+
if err != nil {
41+
return fmt.Errorf("failed to create audit client: %w", err)
42+
}
43+
44+
var auditDefaultEnabled atomic.Bool
45+
46+
wg.Add(1)
47+
48+
go func(c *libaudit.AuditClient) {
49+
defer wg.Done()
50+
51+
<-ctx.Done()
52+
53+
if !auditDefaultEnabled.Load() {
54+
c.SetEnabled(false, libaudit.NoWait) //nolint:errcheck
55+
}
56+
57+
c.Close() //nolint:errcheck
58+
}(client)
59+
60+
status, err := client.GetStatus()
61+
if err != nil {
62+
return fmt.Errorf("failed to get audit status: %w", err)
63+
}
64+
65+
auditDefaultEnabled.Store(status.Enabled >= 1)
66+
67+
if status.Enabled == 0 {
68+
if err := client.SetEnabled(true, libaudit.WaitForReply); err != nil {
69+
return fmt.Errorf("failed to enable audit: %w", err)
70+
}
71+
}
72+
73+
if err = client.SetRateLimit(uint32(4096), libaudit.NoWait); err != nil {
74+
return fmt.Errorf("failed to set rate limit: %w", err)
75+
}
76+
77+
if err := client.SetBacklogLimit(8192, libaudit.NoWait); err != nil {
78+
return fmt.Errorf("failed to set backlog limit: %w", err)
79+
}
80+
81+
if err := client.SetPID(libaudit.NoWait); err != nil {
82+
return fmt.Errorf("failed to set audit PID: %w", err)
83+
}
84+
85+
return receiveEvents(ctx, client, logWriter)
86+
}
87+
88+
func receiveEvents(ctx context.Context, client *libaudit.AuditClient, logWriter io.Writer) error {
89+
for {
90+
rawEvent, err := client.Receive(false)
91+
if err != nil {
92+
if errors.Is(err, syscall.EBADF) {
93+
return nil
94+
}
95+
96+
if errors.Is(err, syscall.EINTR) && errors.Is(err, syscall.EAGAIN) {
97+
continue
98+
}
99+
100+
return fmt.Errorf("failed to receive audit event: %w", err)
101+
}
102+
103+
select {
104+
case <-ctx.Done():
105+
return nil
106+
default:
107+
}
108+
109+
// Messages from 1100-2999 are valid audit messages.
110+
if rawEvent.Type < auparse.AUDIT_USER_AUTH ||
111+
rawEvent.Type > auparse.AUDIT_LAST_USER_MSG2 {
112+
continue
113+
}
114+
115+
fmt.Fprintf(logWriter, "type=%s msg=%s\n", rawEvent.Type, rawEvent.Data)
116+
}
117+
}

‎internal/app/machined/internal/server/v1alpha1/v1alpha1_cluster.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func buildClusterInfo(ctx context.Context,
140140
}
141141

142142
return &clusterState{
143-
nodeInfos: append(slices.Clone(controlPlaneNodeInfos), workerNodeInfos...),
143+
nodeInfos: slices.Concat(controlPlaneNodeInfos, workerNodeInfos),
144144
nodeInfosByType: map[machine.Type][]cluster.NodeInfo{
145145
machine.TypeControlPlane: controlPlaneNodeInfos,
146146
machine.TypeWorker: workerNodeInfos,
@@ -236,13 +236,7 @@ func getDiscoveryMemberList(ctx context.Context, runtime runtime.Runtime) ([]*cl
236236
return nil, err
237237
}
238238

239-
result := make([]*clusterres.Member, 0, list.Len())
240-
241-
for iter := list.Iterator(); iter.Next(); {
242-
result = append(result, iter.Value())
243-
}
244-
245-
return result, nil
239+
return safe.ToSlice(list, func(m *clusterres.Member) *clusterres.Member { return m }), nil
246240
}
247241

248242
func isControlPlaneNode(node *corev1.Node) bool {

‎internal/app/machined/internal/server/v1alpha1/v1alpha1_images.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ package runtime
77
import (
88
"context"
99

10-
containerdapi "github.com/containerd/containerd"
11-
"github.com/containerd/containerd/errdefs"
12-
"github.com/containerd/containerd/namespaces"
13-
criconstants "github.com/containerd/containerd/pkg/cri/constants"
14-
"github.com/containerd/containerd/platforms"
10+
containerdapi "github.com/containerd/containerd/v2/client"
11+
"github.com/containerd/containerd/v2/pkg/namespaces"
12+
"github.com/containerd/errdefs"
13+
"github.com/containerd/platforms"
1514
"google.golang.org/grpc/codes"
1615
"google.golang.org/grpc/status"
1716
"google.golang.org/protobuf/types/known/timestamppb"
@@ -20,14 +19,15 @@ import (
2019
"github.com/siderolabs/talos/pkg/machinery/api/common"
2120
"github.com/siderolabs/talos/pkg/machinery/api/machine"
2221
"github.com/siderolabs/talos/pkg/machinery/constants"
22+
"github.com/siderolabs/talos/pkg/machinery/resources/cri"
2323
)
2424

2525
func containerdNamespaceHelper(ctx context.Context, ns common.ContainerdNamespace) (context.Context, error) {
2626
var namespaceName string
2727

2828
switch ns {
2929
case common.ContainerdNamespace_NS_CRI:
30-
namespaceName = criconstants.K8sContainerdNamespace
30+
namespaceName = constants.K8sContainerdNamespace
3131
case common.ContainerdNamespace_NS_SYSTEM:
3232
namespaceName = constants.SystemContainerdNamespace
3333
case common.ContainerdNamespace_NS_UNKNOWN:
@@ -92,7 +92,7 @@ func (s *Server) ImagePull(ctx context.Context, req *machine.ImagePullRequest) (
9292
return nil, err
9393
}
9494

95-
_, err = image.Pull(ctx, s.Controller.Runtime().Config().Machine().Registries(), client, req.Reference, image.WithSkipIfAlreadyPulled())
95+
_, err = image.Pull(ctx, cri.RegistryBuilder(s.Controller.Runtime().State().V1Alpha2().Resources()), client, req.Reference, image.WithSkipIfAlreadyPulled())
9696
if err != nil {
9797
if errdefs.IsNotFound(err) {
9898
return nil, status.Errorf(codes.NotFound, "error pulling image: %s", err)

0 commit comments

Comments
 (0)