Skip to content

Commit b270d15

Browse files
smirasmira
committed
feat: update CABPT to Talos 1.3.0
Update versions of controller-runtime, generator, core tools, etc. Rename Go module to siderolabs. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit 376eb01)
1 parent 1fb8efe commit b270d15

18 files changed

+289
-448
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ENV CGO_ENABLED 1
5656
ARG TALOS_VERSION
5757
ARG TAG
5858
ARG ARTIFACTS
59-
ARG PKG=github.com/talos-systems/cluster-api-bootstrap-provider-talos/internal/integration
59+
ARG PKG=github.com/siderolabs/cluster-api-bootstrap-provider-talos/internal/integration
6060
ARG GO_LDFLAGS="-linkmode=external -extldflags '-static' -X ${PKG}.TalosVersion=${TALOS_VERSION} -X ${PKG}.Artifacts=${ARTIFACTS} -X ${PKG}.Tag=${TAG}"
6161
RUN --mount=type=cache,target=/.cache go test -race -ldflags "${GO_LDFLAGS}" -coverpkg=./... -v -c ./internal/integration
6262

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ NAME := cluster-api-talos-controller
99
ARTIFACTS := _out
1010
TEST_RUN ?= ./...
1111

12-
TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0
13-
PKGS ?= v1.2.0
14-
TALOS_VERSION ?= v1.2.0
15-
K8S_VERSION ?= 1.25.0
12+
TOOLS ?= ghcr.io/siderolabs/tools:v1.3.0-1-g712379c
13+
PKGS ?= v1.3.0
14+
TALOS_VERSION ?= v1.3.0
15+
K8S_VERSION ?= 1.26.0
1616

17-
CONTROLLER_GEN_VERSION ?= v0.9.1
18-
CONVERSION_GEN_VERSION ?= v0.24.2
17+
CONTROLLER_GEN_VERSION ?= v0.10.0
18+
CONVERSION_GEN_VERSION ?= v0.25.0
1919

2020
BUILD := docker buildx build
2121
PLATFORM ?= linux/amd64

‎README.md‎

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

5656
This provider's versions are able to install and manage the following versions of Kubernetes:
5757
58-
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
59-
| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
60-
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
61-
| CABPT (v0.4.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | | |
62-
| CABPT (v0.5.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
58+
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 |
59+
| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
60+
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | |
61+
| CABPT (v0.4.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
62+
| CABPT (v0.5.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
6363
6464
This provider's versions are compatible with the following versions of Talos:
6565

66-
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 |
67-
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
68-
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | | | | |
69-
| CABPT (v0.4.x) | ✓ | ✓ | ✓ | ✓ | | | |
70-
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
66+
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 | v1.3 |
67+
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
68+
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | | | | | |
69+
| CABPT (v0.4.x) | ✓ | ✓ | ✓ | ✓ | | | | |
70+
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
7171

7272
CABPT generates machine configuration compatible with Talos version specified in the `talosVersion:` field (see below).
7373

‎api/v1alpha2/talosconfig_conversion.go‎

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

77
import (
8-
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
8+
bootstrapv1alpha3 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
99
apiconversion "k8s.io/apimachinery/pkg/conversion"
1010
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
1111
"sigs.k8s.io/controller-runtime/pkg/conversion"

‎api/v1alpha2/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package v1alpha2
66

7-
// +k8s:conversion-gen=github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3
7+
// +k8s:conversion-gen=github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3
88

99
// TalosConfigTemplateResource defines the Template structure
1010
type TalosConfigTemplateResource struct {

‎api/v1alpha2/zz_generated.conversion.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigs.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: talosconfigs.bootstrap.cluster.x-k8s.io
99
spec:

‎config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigtemplates.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: talosconfigtemplates.bootstrap.cluster.x-k8s.io
99
spec:

‎controllers/scheme.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1111
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
1212

13-
bootstrapv1alpha2 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha2"
14-
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
13+
bootstrapv1alpha2 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha2"
14+
bootstrapv1alpha3 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
1515
// +kubebuilder:scaffold:imports
1616
)
1717

‎controllers/secrets.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"sort"
1111

1212
"github.com/go-logr/logr"
13-
"github.com/talos-systems/crypto/x509"
14-
"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate"
15-
talosmachine "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine"
13+
"github.com/siderolabs/crypto/x509"
14+
"github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1/generate"
15+
talosmachine "github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1/machine"
1616
"gopkg.in/yaml.v2"
1717
corev1 "k8s.io/api/core/v1"
1818
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -21,7 +21,7 @@ import (
2121
"sigs.k8s.io/cluster-api/util/collections"
2222
"sigs.k8s.io/controller-runtime/pkg/client"
2323

24-
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"
24+
bootstrapv1alpha3 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
2525
)
2626

2727
func (r *TalosConfigReconciler) fetchSecret(ctx context.Context, config *bootstrapv1alpha3.TalosConfig, secretName string) (*corev1.Secret, error) {

0 commit comments

Comments
 (0)