Skip to content

Commit abd206f

Browse files
committed
feat: update to CAPI v1.0.x contract (v1beta1)
Mostly module version bumps, no functional changes. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
1 parent b7faf9e commit abd206f

19 files changed

+232
-210
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ NAME := cluster-api-talos-controller
88

99
ARTIFACTS := _out
1010

11-
TOOLS ?= ghcr.io/talos-systems/tools:v0.8.0-alpha.0-3-g2790b55
11+
TOOLS ?= ghcr.io/talos-systems/tools:v0.8.0
1212
PKGS ?= v0.8.0
1313
TALOS_VERSION ?= v0.13.0
1414
K8S_VERSION ?= 1.22.2
1515

16-
CONTROLLER_GEN_VERSION ?= v0.6.2
17-
CONVERSION_GEN_VERSION ?= v0.21.3
16+
CONTROLLER_GEN_VERSION ?= v0.7.0
17+
CONVERSION_GEN_VERSION ?= v0.22.2
1818

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

api/v1alpha3/conditions.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-
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
8+
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
99
)
1010

1111
// Conditions and condition Reasons for the TalosConfig object

api/v1alpha3/talosconfig_types.go

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

77
import (
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
9+
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1010
)
1111

1212
const (

api/v1alpha3/zz_generated.deepcopy.go

Lines changed: 2 additions & 2 deletions
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: talosconfigs.bootstrap.cluster.x-k8s.io
1010
spec:
@@ -158,6 +158,7 @@ spec:
158158
important.
159159
type: string
160160
required:
161+
- lastTransitionTime
161162
- status
162163
- type
163164
type: object

config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigtemplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: talosconfigtemplates.bootstrap.cluster.x-k8s.io
1010
spec:

config/crd/kustomization.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
commonLabels:
5-
cluster.x-k8s.io/v1alpha3: v1alpha3
6-
cluster.x-k8s.io/v1alpha4: v1alpha3
5+
cluster.x-k8s.io/v1alpha3: v1alpha3
6+
cluster.x-k8s.io/v1alpha4: v1alpha3
7+
cluster.x-k8s.io/v1beta1: v1alpha3
78

89
resources:
910
- bases/bootstrap.cluster.x-k8s.io_talosconfigs.yaml

config/metadata/metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ releaseSeries:
1010
- major: 0
1111
minor: 4
1212
contract: v1alpha4
13+
- major: 0
14+
minor: 5
15+
contract: v1beta1

controllers/scheme.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package controllers
77
import (
88
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
99
"k8s.io/client-go/kubernetes/scheme"
10-
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
11-
expv1 "sigs.k8s.io/cluster-api/exp/api/v1alpha4"
10+
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
11+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
1212

1313
bootstrapv1alpha2 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha2"
1414
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"

controllers/secrets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
corev1 "k8s.io/api/core/v1"
1515
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
17-
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
17+
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919

2020
bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3"

0 commit comments

Comments
 (0)