chore: bump dependencies

CAPI, controller-runtime, Talos, etc. Fix linting issues. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Apr 5, 2023 · 9121a3b · 9121a3b
1 parent 18116bc
commit 9121a3b
Show file tree

Hide file tree

Showing 29 changed files with 933 additions and 673 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ node_modules
 website/resources
 website/public
 website/.hugo_build.lock
+
+go.work.sum
diff --git a/Dockerfile b/Dockerfile
@@ -42,10 +42,10 @@ ARG CGO_ENABLED
 ENV CGO_ENABLED ${CGO_ENABLED}
 ENV GOCACHE /.cache/go-build
 ENV GOMODCACHE /.cache/mod
-RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0
-RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.25.0
+RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.3
+RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.26.1
 RUN --mount=type=cache,target=/.cache go install mvdan.cc/gofumpt/[email protected]
-RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.2 \
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2 \
 	&& mv /go/bin/golangci-lint /toolchain/bin/golangci-lint
 WORKDIR /src
 COPY ./go.mod ./
@@ -88,7 +88,7 @@ COPY --from=generate-build /src/app/caps-controller-manager/api ./app/caps-contr
 COPY --from=generate-build /src/app/sidero-controller-manager/api ./app/sidero-controller-manager/api
 COPY --from=generate-build /src/app/sidero-controller-manager/internal/api ./app/sidero-controller-manager/internal/api
 
-FROM --platform=${BUILDPLATFORM} alpine:3.16.2 AS release-build
+FROM --platform=${BUILDPLATFORM} alpine:3.17.3 AS release-build
 ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.1.0/kustomize_v4.1.0_linux_amd64.tar.gz .
 RUN  tar -xf kustomize_v4.1.0_linux_amd64.tar.gz -C /usr/local/bin && rm kustomize_v4.1.0_linux_amd64.tar.gz
 COPY ./config ./config
@@ -254,7 +254,7 @@ COPY --from=fmt-build /src /
 #
 # The markdownlint target performs linting on Markdown files.
 #
-FROM node:18.8.0-alpine AS lint-markdown
+FROM node:19.8.1-alpine AS lint-markdown
 RUN apk add --no-cache findutils
 RUN npm i -g [email protected]
 RUN npm i -g [email protected]

diff --git a/Makefile b/Makefile
@@ -9,12 +9,12 @@ MODULE := $(shell head -1 go.mod | cut -d' ' -f2)
 
 ARTIFACTS := _out
 TEST_PKGS ?= ./...
-TALOS_RELEASE ?= v1.3.0
+TALOS_RELEASE ?= v1.4.0-beta.0
 PREVIOUS_TALOS_RELEASE ?= v0.13.4
 DEFAULT_K8S_VERSION ?= v1.26.0
 
-TOOLS ?= ghcr.io/siderolabs/tools:v1.3.0-1-g712379c
-PKGS ?= v1.3.0-6-g5a39853
+TOOLS ?= ghcr.io/siderolabs/tools:v1.4.0
+PKGS ?= v1.3.0-16-gd1b0e28
 
 SFYRA_CLUSTERCTL_CONFIG ?= $(HOME)/.cluster-api/clusterctl.sfyra.yaml
 

diff --git a/README.md b/README.md
@@ -14,25 +14,22 @@ This provider's versions are compatible with the following versions of Cluster A
 
 |                        | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.x) |
 | ---------------------- | --------------- | --------------- | -------------- |
-| Sidero Provider (v0.3) | ✓               |                 |                |
-| Sidero Provider (v0.4) |                 | ✓               |                |
 | Sidero Provider (v0.5) |                 |                 | ✓              |
+| Sidero Provider (v0.6) |                 |                 | ✓              |
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
-|                        | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
-| ---------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
-| Sidero Provider (v0.3) | ✓     | ✓      | ✓     | ✓     | ✓     | ✓     |       |       |       |       |       |
-| Sidero Provider (v0.4) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |
-| Sidero Provider (v0.5) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                        | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 | v1.27 |
+| ---------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| Sidero Provider (v0.5) | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+| Sidero Provider (v0.6) |       |       |       |       |       | ✓     | ✓     | ✓     | ✓     |
 
 This provider's versions are compatible with the following versions of Talos:
 
-|                        | v0.11 | v0.12  | v0.13 | v0.14 | v1.0  | v1.1  | v1.2  | v1.3  |
-| ---------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- |
-| Sidero Provider (v0.3) | ✓     | ✓      |       |       |       |       |       |       |
-| Sidero Provider (v0.4) | ✓     | ✓      | ✓     | ✓     |       |       |       |       |
-| Sidero Provider (v0.5) |       | ✓ (+)  | ✓ (+) | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                        | v0.12  | v0.13 | v0.14 | v1.0  | v1.1  | v1.2  | v1.3  | v1.4  |
+| ---------------------- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| Sidero Provider (v0.5) | ✓ (+)  | ✓ (+) | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+| Sidero Provider (v0.6) |        |       |       | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 > (+): Some Sidero 0.5 features (SideroLink) are only available with Talos v0.14+.
 

diff --git a/...ps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml b/...ps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: metalclusters.infrastructure.cluster.x-k8s.io
 spec:

diff --git a/...ps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml b/...ps-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: metalmachines.infrastructure.cluster.x-k8s.io
 spec:
@@ -327,8 +327,8 @@ spec:
                       description: The machine address.
                       type: string
                     type:
-                      description: Machine address type, one of Hostname, ExternalIP
-                        or InternalIP.
+                      description: Machine address type, one of Hostname, ExternalIP,
+                        InternalIP, ExternalDNS or InternalDNS.
                       type: string
                   required:
                   - address

diff --git a/...oller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml b/...oller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: metalmachinetemplates.infrastructure.cluster.x-k8s.io
 spec:

diff --git a/...s-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml b/...s-controller-manager/config/crd/bases/infrastructure.cluster.x-k8s.io_serverbindings.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: serverbindings.infrastructure.cluster.x-k8s.io
 spec:

diff --git a/app/caps-controller-manager/controllers/metalmachine_controller.go b/app/caps-controller-manager/controllers/metalmachine_controller.go
@@ -195,7 +195,7 @@ func (r *MetalMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	// Set the providerID, as its required in upstream capi for machine lifecycle
-	metalMachine.Spec.ProviderID = pointer.StringPtr(fmt.Sprintf("%s://%s", constants.ProviderID, metalMachine.Spec.ServerRef.Name))
+	metalMachine.Spec.ProviderID = pointer.String(fmt.Sprintf("%s://%s", constants.ProviderID, metalMachine.Spec.ServerRef.Name))
 
 	// Copy over statuses from ServerBinding to MetalMachine
 	if metalMachine.Spec.ServerRef != nil {

diff --git a/app/caps-controller-manager/controllers/suite_test.go b/app/caps-controller-manager/controllers/suite_test.go
diff --git a/app/sidero-controller-manager/cmd/siderolink-manager/main.go b/app/sidero-controller-manager/cmd/siderolink-manager/main.go
@@ -16,7 +16,6 @@ import (
 	"os/signal"
 	"syscall"
 
-	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
 	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
 	grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"
@@ -128,12 +127,12 @@ func run() error {
 	recoveryOpt := grpc_recovery.WithRecoveryHandler(recoveryHandler(logger))
 
 	serverOptions := []grpc.ServerOption{
-		grpc_middleware.WithUnaryServerChain(
+		grpc.ChainUnaryInterceptor(
 			grpc_ctxtags.UnaryServerInterceptor(),
 			grpc_zap.UnaryServerInterceptor(logger),
 			grpc_recovery.UnaryServerInterceptor(recoveryOpt),
 		),
-		grpc_middleware.WithStreamServerChain(
+		grpc.ChainStreamInterceptor(
 			grpc_ctxtags.StreamServerInterceptor(),
 			grpc_zap.StreamServerInterceptor(logger),
 			grpc_recovery.StreamServerInterceptor(recoveryOpt),

diff --git a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_environments.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: environments.metal.sidero.dev
 spec:

diff --git a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_serverclasses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: serverclasses.metal.sidero.dev
 spec:

diff --git a/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml b/app/sidero-controller-manager/config/crd/bases/metal.sidero.dev_servers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: servers.metal.sidero.dev
 spec:

diff --git a/app/sidero-controller-manager/controllers/suite_test.go b/app/sidero-controller-manager/controllers/suite_test.go
diff --git a/app/sidero-controller-manager/internal/api/api.pb.go b/app/sidero-controller-manager/internal/api/api.pb.go