Skip to content

Commit ecdeb59

Browse files
committed
feat: update for Talos 1.3.0
Bump machinery, capi-utils, Talos version, Cluster API core, etc. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit d105ecc)
1 parent 1a3c9d1 commit ecdeb59

18 files changed

+306
-380
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ ENV GO111MODULE on
2424
ENV GOPROXY https://proxy.golang.org
2525
ENV GOCACHE /.cache/go-build
2626
ENV GOMODCACHE /.cache/mod
27-
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.1
28-
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.24.2
27+
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0
28+
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.25.0
2929
WORKDIR /src
3030
COPY ./go.mod ./
3131
COPY ./go.sum ./

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ GO_LDFLAGS += -s -w
1818

1919
ARTIFACTS := _out
2020

21-
TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0
22-
PKGS ?= v1.2.0
21+
TOOLS ?= ghcr.io/siderolabs/tools:v1.3.0-1-g712379c
22+
PKGS ?= v1.3.0
2323

2424
BUILD := docker buildx build
2525
PLATFORM ?= linux/amd64

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ This provider's versions are compatible with the following versions of Cluster A
2626

2727
This provider's versions are able to install and manage the following versions of Kubernetes:
2828

29-
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
30-
| ------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
31-
| Control Plane Provider Talos v1alpha3 (v0.2) ||||||| | | | |
32-
| Control Plane Provider Talos v1alpha3 (v0.3) ||||||| | | | |
33-
| Control Plane Provider Talos v1alpha3 (v0.4) | | | ||||||||
29+
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
30+
| ------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
31+
| Control Plane Provider Talos v1alpha3 (v0.2) ||||||| | | | | |
32+
| Control Plane Provider Talos v1alpha3 (v0.3) ||||||| | | | | |
33+
| Control Plane Provider Talos v1alpha3 (v0.4) | | | |||||||||
3434

3535
This provider's versions are compatible with the following versions of Talos:
3636

37-
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 |
38-
| -------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- |
39-
| Control Plane Provider Talos v1alpha3 (v0.3) ||| | | | | |
40-
| Control Plane Provider Talos v1alpha3 (v0.3) |||| | | | |
41-
| Control Plane Provider Talos v1alpha3 (v0.4) ||||||||
37+
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 | v1.3 |
38+
| -------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- |
39+
| Control Plane Provider Talos v1alpha3 (v0.3) ||| | | | | | |
40+
| Control Plane Provider Talos v1alpha3 (v0.3) |||| | | | | |
41+
| Control Plane Provider Talos v1alpha3 (v0.4) |||||||||
4242

4343
## Building and Installing
4444

api/v1alpha3/taloscontrolplane_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package v1alpha3
66

77
import (
8-
cabptv1 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
8+
cabptv1 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
99
corev1 "k8s.io/api/core/v1"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/apimachinery/pkg/util/intstr"

config/crd/bases/controlplane.cluster.x-k8s.io_taloscontrolplanes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.1
6+
controller-gen.kubebuilder.io/version: v0.10.0
77
creationTimestamp: null
88
name: taloscontrolplanes.controlplane.cluster.x-k8s.io
99
spec:

controllers/configs.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"reflect"
1212
"time"
1313

14-
cabptv1 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
15-
controlplanev1 "github.com/talos-systems/cluster-api-control-plane-provider-talos/api/v1alpha3"
16-
talosclient "github.com/talos-systems/talos/pkg/machinery/client"
17-
talosconfig "github.com/talos-systems/talos/pkg/machinery/client/config"
14+
cabptv1 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
15+
controlplanev1 "github.com/siderolabs/cluster-api-control-plane-provider-talos/api/v1alpha3"
16+
talosclient "github.com/siderolabs/talos/pkg/machinery/client"
17+
talosconfig "github.com/siderolabs/talos/pkg/machinery/client/config"
1818
corev1 "k8s.io/api/core/v1"
1919
v1 "k8s.io/api/core/v1"
2020
"k8s.io/apimachinery/pkg/types"

controllers/controlplane.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/go-logr/logr"
1111
"github.com/pkg/errors"
12-
"github.com/talos-systems/cluster-api-control-plane-provider-talos/api/v1alpha3"
13-
controlplanev1 "github.com/talos-systems/cluster-api-control-plane-provider-talos/api/v1alpha3"
12+
"github.com/siderolabs/cluster-api-control-plane-provider-talos/api/v1alpha3"
13+
controlplanev1 "github.com/siderolabs/cluster-api-control-plane-provider-talos/api/v1alpha3"
1414
apierrors "k8s.io/apimachinery/pkg/api/errors"
1515
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1616
"k8s.io/klog/v2/klogr"

controllers/etcd.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"fmt"
1010
"strings"
1111

12-
controlplanev1 "github.com/talos-systems/cluster-api-control-plane-provider-talos/api/v1alpha3"
13-
"github.com/talos-systems/talos/pkg/machinery/api/machine"
14-
talosclient "github.com/talos-systems/talos/pkg/machinery/client"
12+
controlplanev1 "github.com/siderolabs/cluster-api-control-plane-provider-talos/api/v1alpha3"
13+
"github.com/siderolabs/talos/pkg/machinery/api/machine"
14+
talosclient "github.com/siderolabs/talos/pkg/machinery/client"
1515
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1616
"sigs.k8s.io/controller-runtime/pkg/client"
1717
)

controllers/health.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"time"
1212

1313
"github.com/pkg/errors"
14-
controlplanev1 "github.com/talos-systems/cluster-api-control-plane-provider-talos/api/v1alpha3"
15-
machineapi "github.com/talos-systems/talos/pkg/machinery/api/machine"
16-
talosclient "github.com/talos-systems/talos/pkg/machinery/client"
14+
controlplanev1 "github.com/siderolabs/cluster-api-control-plane-provider-talos/api/v1alpha3"
15+
machineapi "github.com/siderolabs/talos/pkg/machinery/api/machine"
16+
talosclient "github.com/siderolabs/talos/pkg/machinery/client"
1717
"google.golang.org/grpc/codes"
1818
"google.golang.org/grpc/status"
1919
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

controllers/scale.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/coreos/go-semver/semver"
14-
controlplanev1 "github.com/talos-systems/cluster-api-control-plane-provider-talos/api/v1alpha3"
14+
controlplanev1 "github.com/siderolabs/cluster-api-control-plane-provider-talos/api/v1alpha3"
1515
v1 "k8s.io/api/core/v1"
1616
apierrors "k8s.io/apimachinery/pkg/api/errors"
1717
"k8s.io/apimachinery/pkg/types"

0 commit comments

Comments
 (0)