feat: update dependencies for Talos 1.9.0-beta.0

Some restructuring due to udevd -> system-udevd switch. Mostly minor bumps. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Dec 5, 2024 · b8daa0c · b8daa0c
1 parent 999e6e9
commit b8daa0c
Show file tree

Hide file tree

Showing 19 changed files with 626 additions and 777 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -84,7 +84,10 @@ linters-settings:
     range-loops: true # Report preallocation suggestions on range loops, true by default
     for-loops: false # Report preallocation suggestions on for loops, false by default
   gci:
-    local-prefixes: github.com/talos-systems/sidero
+    sections:
+      - standard # Captures all standard packages if they do not match another section.
+      - default # Contains all imports that could not be matched to another section type.
+      - prefix(github.com/siderolabs/sidero) # Groups all imports with the specified Prefix.
   cyclop:
     # the maximal code complexity to report
     max-complexity: 20
@@ -99,27 +102,23 @@ linters:
     - forcetypeassert
     - gci
     - gocyclo
-    - golint
     - govet
     - lll
     - nlreturn
     - predeclared
     - revive
     - stylecheck
 
-    - gas
+    - gosec
     - typecheck
     - gochecknoglobals
     - gochecknoinits
-    - ifshort
     - forbidigo
     - funlen
     - godox
     - gocognit
-    - gomnd
-    - goerr113
+    - err113
     - nestif
-    - exhaustivestruct
     - errorlint
     - paralleltest
     - thelper
@@ -129,21 +128,15 @@ linters:
     - varnamelen
     - gomoddirectives
     - exhaustruct
-    - nosnakecase
     - nonamedreturns
     - depguard
     # abandoned linters for which golangci shows the warning that the repo is archived by the owner
-    - interfacer
-    - maligned
-    - scopelint
-    - varcheck
-    - structcheck
-    - deadcode
     - intrange
     - perfsprint
     - protogetter
     - testifylint
     - copyloopvar
+    - mnd
   disable-all: false
   fast: false
 

diff --git a/Dockerfile b/Dockerfile
@@ -24,8 +24,16 @@ FROM ghcr.io/siderolabs/liblzma:${PKGS} AS pkg-liblzma
 FROM ghcr.io/siderolabs/ipxe:${PKGS} AS pkg-ipxe
 FROM --platform=amd64 ghcr.io/siderolabs/ipxe:${PKGS} AS pkg-ipxe-amd64
 FROM --platform=arm64 ghcr.io/siderolabs/ipxe:${PKGS} AS pkg-ipxe-arm64
-FROM --platform=amd64 ghcr.io/siderolabs/eudev:${PKGS} AS pkg-eudev-amd64
-FROM --platform=arm64 ghcr.io/siderolabs/eudev:${PKGS} AS pkg-eudev-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/systemd-udevd:${PKGS} AS pkg-systemd-udevd-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/systemd-udevd:${PKGS} AS pkg-systemd-udevd-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/libcap:${PKGS} AS pkg-libcap-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/libcap:${PKGS} AS pkg-libcap-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/libsepol:${PKGS} AS pkg-libsepol-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/libsepol:${PKGS} AS pkg-libsepol-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/libselinux:${PKGS} AS pkg-libselinux-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/libselinux:${PKGS} AS pkg-libselinux-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/pcre2:${PKGS} AS pkg-pcre2-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/pcre2:${PKGS} AS pkg-pcre2-arm64
 FROM --platform=amd64 ghcr.io/siderolabs/util-linux:${PKGS} AS pkg-util-linux-amd64
 FROM --platform=arm64 ghcr.io/siderolabs/util-linux:${PKGS} AS pkg-util-linux-arm64
 FROM --platform=amd64 ghcr.io/siderolabs/kmod:${PKGS} AS pkg-kmod-amd64
@@ -53,7 +61,7 @@ ENV GOTOOLCHAIN local
 RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/[email protected]
 RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/[email protected]
 RUN --mount=type=cache,target=/.cache go install mvdan.cc/gofumpt/[email protected]
-RUN --mount=type=cache,target=/.cache go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.1 \
+RUN --mount=type=cache,target=/.cache go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 \
 	&& mv /go/bin/golangci-lint /toolchain/bin/golangci-lint
 WORKDIR /src
 COPY ./go.mod ./
@@ -188,7 +196,11 @@ COPY --from=pkg-musl-amd64 / .
 COPY --from=pkg-openssl-amd64 / .
 COPY --from=pkg-util-linux-amd64 / .
 COPY --from=pkg-kmod-amd64 / .
-COPY --from=pkg-eudev-amd64 / .
+COPY --from=pkg-systemd-udevd-amd64 / .
+COPY --from=pkg-libcap-amd64 / .
+COPY --from=pkg-libsepol-amd64 / .
+COPY --from=pkg-libselinux-amd64 / .
+COPY --from=pkg-pcre2-amd64 / .
 COPY --from=pkg-ipmitool-amd64 / .
 COPY --from=agent-build-amd64 /agent ./init
 COPY --from=pkg-linux-firmware /lib/firmware/qed ./lib/firmware/qed
@@ -206,7 +218,11 @@ COPY --from=pkg-musl-arm64 / .
 COPY --from=pkg-openssl-arm64 / .
 COPY --from=pkg-util-linux-arm64 / .
 COPY --from=pkg-kmod-arm64 / .
-COPY --from=pkg-eudev-arm64 / .
+COPY --from=pkg-systemd-udevd-arm64 / .
+COPY --from=pkg-libcap-arm64 / .
+COPY --from=pkg-libsepol-arm64 / .
+COPY --from=pkg-libselinux-arm64 / .
+COPY --from=pkg-pcre2-arm64 / .
 COPY --from=pkg-ipmitool-arm64 / .
 COPY --from=agent-build-arm64 /agent ./init
 COPY --from=pkg-linux-firmware /lib/firmware/qed ./lib/firmware/qed

diff --git a/Makefile b/Makefile
@@ -9,11 +9,11 @@ MODULE := $(shell head -1 go.mod | cut -d' ' -f2)
 
 ARTIFACTS := _out
 TEST_PKGS ?= ./...
-TALOS_RELEASE ?= v1.8.0
-DEFAULT_K8S_VERSION ?= v1.30.0
+TALOS_RELEASE ?= v1.9.0-beta.0
+DEFAULT_K8S_VERSION ?= v1.31.0
 
-TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-1-ga0c06c6
-PKGS ?= v1.8.0-8-gdf1a1a5
+TOOLS ?= ghcr.io/siderolabs/tools:v1.9.0
+PKGS ?= v1.9.0
 
 SFYRA_CLUSTERCTL_CONFIG ?= $(HOME)/.cluster-api/clusterctl.sfyra.yaml
 

diff --git a/README.md b/README.md
@@ -26,17 +26,17 @@ This provider's versions are compatible with the following versions of Cluster A
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
-|                        | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 | v1.27 | v1.28 | v1.29 | v1.30 | v1.31 |
-| ---------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
-| Sidero Provider (v0.5) | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |       |
-| Sidero Provider (v0.6) |       |       |       |       |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                        | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 | v1.27 | v1.28 | v1.29 | v1.30 | v1.31 | v1.32 |
+| ---------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| Sidero Provider (v0.5) | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |       |       |
+| Sidero Provider (v0.6) |       |       |       |       |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 This provider's versions are compatible with the following versions of Talos:
 
-|                        | v0.12  | v0.13 | v0.14 | v1.0  | v1.1  | v1.2  | v1.3  | v1.4  | v1.5  | v1.6  | v1.7  | v1.8  |
-| ---------------------- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
-| Sidero Provider (v0.5) | ✓ (+)  | ✓ (+) | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |       |       |
-| Sidero Provider (v0.6) |        |       |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                        | v0.12  | v0.13 | v0.14 | v1.0  | v1.1  | v1.2  | v1.3  | v1.4  | v1.5  | v1.6  | v1.7  | v1.8  | v1.9  |
+| ---------------------- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| Sidero Provider (v0.5) | ✓ (+)  | ✓ (+) | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |       |       |       |
+| Sidero Provider (v0.6) |        |       |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 ## Support
 

diff --git a/app/caps-controller-manager/config/manager/manager.yaml b/app/caps-controller-manager/config/manager/manager.yaml
@@ -39,6 +39,9 @@ spec:
             - containerPort: 9440
               name: healthz
               protocol: TCP
+          env:
+            - name: GRPC_ENFORCE_ALPN_ENABLED # Compatibility with Talos < 1.9
+              value: "false"
           readinessProbe:
             httpGet:
               path: /readyz

diff --git a/app/sidero-controller-manager/cmd/agent/boot.go b/app/sidero-controller-manager/cmd/agent/boot.go
@@ -84,7 +84,7 @@ func runUdevd() error {
 		return fmt.Errorf("error running udevadm hwdb --update: %w", err)
 	}
 
-	udevdCmd := exec.Command("/sbin/udevd",
+	udevdCmd := exec.Command("/sbin/systemd-udevd",
 		"--resolve-names=never")
 	udevdCmd.Stdout = os.Stdout
 	udevdCmd.Stderr = os.Stderr

diff --git a/app/sidero-controller-manager/cmd/events-manager/adapter.go b/app/sidero-controller-manager/cmd/events-manager/adapter.go
@@ -6,6 +6,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/netip"
 	"strings"
@@ -124,13 +125,13 @@ func (a *Adapter) HandleEvent(ctx context.Context, event events.Event) error {
 			return err
 		}
 	case *machine.ConfigValidationErrorEvent:
-		fields = append(fields, zap.Error(fmt.Errorf(event.GetError())))
+		fields = append(fields, zap.Error(errors.New(event.GetError())))
 
 		if err = a.handleConfigValidationFailedEvent(ctx, ip.String(), event); err != nil {
 			return err
 		}
 	case *machine.ConfigLoadErrorEvent:
-		fields = append(fields, zap.Error(fmt.Errorf(event.GetError())))
+		fields = append(fields, zap.Error(errors.New(event.GetError())))
 
 		if err = a.handleConfigLoadFailedEvent(ctx, ip.String(), event); err != nil {
 			return err
@@ -154,7 +155,7 @@ func (a *Adapter) HandleEvent(ctx context.Context, event events.Event) error {
 		}
 
 		if event.GetError() != nil {
-			err = fmt.Errorf(event.GetError().GetMessage())
+			err = errors.New(event.GetError().GetMessage())
 		}
 	}
 

diff --git a/app/sidero-controller-manager/config/manager/manager.yaml b/app/sidero-controller-manager/config/manager/manager.yaml
@@ -114,6 +114,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
+            - name: GRPC_ENFORCE_ALPN_ENABLED # Compatibility with Talos < 1.9
+              value: "false"
           resources:
             limits:
               cpu: 1000m
@@ -143,6 +145,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
+            - name: GRPC_ENFORCE_ALPN_ENABLED # Compatibility with Talos < 1.9
+              value: "false"
           ports:
             - name: siderolink
               containerPort: ${SIDERO_CONTROLLER_MANAGER_SIDEROLINK_PORT:=51821}
@@ -169,6 +173,9 @@ spec:
           image: controller:latest
           imagePullPolicy: Always
           name: serverlogs
+          env:
+            - name: GRPC_ENFORCE_ALPN_ENABLED # Compatibility with Talos < 1.9
+              value: "false"
           resources:
             limits:
               cpu: 256m
@@ -191,6 +198,9 @@ spec:
           image: controller:latest
           imagePullPolicy: Always
           name: serverevents
+          env:
+            - name: GRPC_ENFORCE_ALPN_ENABLED # Compatibility with Talos < 1.9
+              value: "false"
           resources:
             limits:
               cpu: 256m