Skip to content

Commit 05bd8c1

Browse files
steffen-karlssonsmira
authored andcommitted
feat: upgrade to CAPI v1.11.x
Upgrading the `cluster-api` version from `v1.10.4` to `v1.11.1` with underlying changes to Talos specific configs, same logic as before. Signed-off-by: Steffen Karlsson <[email protected]> Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 5b26ed7 commit 05bd8c1

23 files changed

+259
-297
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-09-01T14:49:33Z by kres 784fa1f.
3+
# Generated on 2025-09-22T15:35:18Z by kres fdbc9fc.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -26,13 +26,12 @@ jobs:
2626
packages: write
2727
pull-requests: read
2828
runs-on:
29-
- self-hosted
30-
- generic
29+
group: generic
3130
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && github.event_name == 'pull_request'
3231
steps:
3332
- name: gather-system-info
3433
id: system-info
35-
uses: kenchan0130/actions-system-info@v1.3.1
34+
uses: kenchan0130/actions-system-info@v1.4.0
3635
continue-on-error: true
3736
- name: print-system-info
3837
run: |
@@ -104,13 +103,12 @@ jobs:
104103
packages: write
105104
pull-requests: read
106105
runs-on:
107-
- self-hosted
108-
- generic
106+
group: generic
109107
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/')
110108
steps:
111109
- name: gather-system-info
112110
id: system-info
113-
uses: kenchan0130/actions-system-info@v1.3.1
111+
uses: kenchan0130/actions-system-info@v1.4.0
114112
continue-on-error: true
115113
- name: print-system-info
116114
run: |
@@ -166,13 +164,12 @@ jobs:
166164
packages: write
167165
pull-requests: read
168166
runs-on:
169-
- self-hosted
170-
- generic
167+
group: generic
171168
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) && startsWith(github.ref, 'refs/tags/')
172169
steps:
173170
- name: gather-system-info
174171
id: system-info
175-
uses: kenchan0130/actions-system-info@v1.3.1
172+
uses: kenchan0130/actions-system-info@v1.4.0
176173
continue-on-error: true
177174
- name: print-system-info
178175
run: |

.github/workflows/slack-notify-ci-failure.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-11T16:22:48Z by kres 79636f7.
3+
# Generated on 2025-09-22T15:35:18Z by kres fdbc9fc.
44

55
"on":
66
workflow_run:
@@ -14,8 +14,7 @@ name: slack-notify-failure
1414
jobs:
1515
slack-notify:
1616
runs-on:
17-
- self-hosted
18-
- generic
17+
group: generic
1918
if: github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event != 'pull_request'
2019
steps:
2120
- name: Slack Notify

.github/workflows/slack-notify.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-11T16:22:48Z by kres 79636f7.
3+
# Generated on 2025-09-22T15:35:18Z by kres fdbc9fc.
44

55
"on":
66
workflow_run:
@@ -12,8 +12,7 @@ name: slack-notify
1212
jobs:
1313
slack-notify:
1414
runs-on:
15-
- self-hosted
16-
- generic
15+
group: generic
1716
if: github.event.workflow_run.conclusion != 'skipped'
1817
steps:
1918
- name: Get PR number

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-11T16:22:48Z by kres 79636f7.
3+
# Generated on 2025-09-22T15:35:18Z by kres fdbc9fc.
44

55
"on":
66
schedule:
@@ -15,7 +15,7 @@ jobs:
1515
- ubuntu-latest
1616
steps:
1717
- name: Close stale issues and PRs
18-
uses: actions/stale@v9.1.0
18+
uses: actions/stale@v10.0.0
1919
with:
2020
close-issue-message: This issue was closed because it has been stalled for 7 days with no activity.
2121
days-before-issue-close: "5"

.kres.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ spec:
2929
- name: default
3030
buildxOptions:
3131
enabled: true
32-
runners:
33-
- self-hosted
34-
- generic
32+
runnerGroup: generic
3533
conditions:
3634
- on-pull-request
3735
steps:
@@ -56,9 +54,7 @@ spec:
5654
- name: push
5755
buildxOptions:
5856
enabled: true
59-
runners:
60-
- self-hosted
61-
- generic
57+
runnerGroup: generic
6258
conditions:
6359
- except-pull-request
6460
- not-on-tag
@@ -74,9 +70,7 @@ spec:
7470
- name: tag
7571
buildxOptions:
7672
enabled: true
77-
runners:
78-
- self-hosted
79-
- generic
73+
runnerGroup: generic
8074
conditions:
8175
- only-on-tag
8276
steps:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ K8S_VERSION ?= 1.34.0
1616

1717
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
1818

19-
CONTROLLER_GEN_VERSION ?= v0.17.0
20-
CONVERSION_GEN_VERSION ?= v0.32.3
19+
CONTROLLER_GEN_VERSION ?= v0.18.0
20+
CONVERSION_GEN_VERSION ?= v0.33.3
2121

2222
BUILD := docker buildx build
2323
PLATFORM ?= linux/amd64

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,27 @@ providers:
4747
4848
This provider's versions are compatible with the following versions of Cluster API:
4949

50-
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.x) |
51-
| -------------- | --------------- | --------------- | -------------- |
52-
| CABPT (v0.5.x) | | ||
53-
| CABPT (v0.6.x) | | ||
50+
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.x) | v1beta2 (v1.1.x) |
51+
| -------------- | --------------- | --------------- | -------------- | -------------- |
52+
| CABPT (v0.5.x) | | || |
53+
| CABPT (v0.6.x) | | || |
54+
| CABPT (v0.7.x) | | | ||
5455

5556
This provider's versions are able to install and manage the following versions of Kubernetes:
5657
5758
| | 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 | v1.33 | v1.34 |
5859
| -------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
5960
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | |
6061
| CABPT (v0.6.x) | | | | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
62+
| CABPT (v0.7.x) | | | | | | | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
6163
6264
This provider's versions are compatible with the following versions of Talos:
6365

6466
| | v1.0 | v1.1 | v1.2 | v1.3 | v1.4 | v1.5 | v1.6 | v1.7 | v1.8 | v1.9 | v1.10 | v1.11 |
6567
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
6668
| CABPT (v0.5.x) ||||| | | | | | | | |
6769
| CABPT (v0.6.x) | | |||||||||||
70+
| CABPT (v0.7.x) | | | | | | | | | ||||
6871

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

api/v1alpha3/conditions.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
package v1alpha3
66

7-
import (
8-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
9-
)
10-
117
// Conditions and condition Reasons for the TalosConfig object
128

139
const (
@@ -16,7 +12,7 @@ const (
1612
// NOTE: When the DataSecret generation starts the process completes immediately and within the
1713
// same reconciliation, so the user will always see a transition from Wait to Generated without having
1814
// evidence that BootstrapSecret generation is started/in progress.
19-
DataSecretAvailableCondition capiv1.ConditionType = "DataSecretAvailable"
15+
DataSecretAvailableCondition string = "DataSecretAvailable"
2016

2117
// WaitingForClusterInfrastructureReason (Severity=Info) document a bootstrap secret generation process
2218
// waiting for the cluster infrastructure to be ready.
@@ -33,7 +29,7 @@ const (
3329

3430
const (
3531
// ClientConfigAvailableCondition documents the status of the client config generation process.
36-
ClientConfigAvailableCondition capiv1.ConditionType = "ClientConfigAvailable"
32+
ClientConfigAvailableCondition string = "ClientConfigAvailable"
3733

3834
// ClientConfigGenerationFailedReason (Severity=Warning) documents a TalosConfig controller detecting
3935
// an error while generating a client config; those kind of errors are usually due to misconfigurations

api/v1alpha3/talosconfig_types.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package v1alpha3
66

77
import (
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
109
)
1110

1211
const (
@@ -76,7 +75,7 @@ type TalosConfigStatus struct {
7675

7776
// Conditions defines current service state of the TalosConfig.
7877
// +optional
79-
Conditions capiv1.Conditions `json:"conditions,omitempty"`
78+
Conditions []metav1.Condition `json:"conditions,omitempty"`
8079
}
8180

8281
// +kubebuilder:object:root=true
@@ -94,12 +93,12 @@ type TalosConfig struct {
9493
}
9594

9695
// GetConditions returns the set of conditions for this object.
97-
func (c *TalosConfig) GetConditions() capiv1.Conditions {
96+
func (c *TalosConfig) GetConditions() []metav1.Condition {
9897
return c.Status.Conditions
9998
}
10099

101100
// SetConditions sets the conditions on this object.
102-
func (c *TalosConfig) SetConditions(conditions capiv1.Conditions) {
101+
func (c *TalosConfig) SetConditions(conditions []metav1.Condition) {
103102
c.Status.Conditions = conditions
104103
}
105104

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.

0 commit comments

Comments
 (0)