Skip to content

Commit 8454fe9

Browse files
smirasmira
committed
feat: add upgrade path for 1.35
No checks yet, just allow the path. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 40e5536 commit 8454fe9

File tree

8 files changed

+130
-36
lines changed

8 files changed

+130
-36
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 105 additions & 17 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-28T10:42:20Z by kres 4a927f7.
3+
# Generated on 2025-10-24T13:46:55Z by kres 46e133d.
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/'))
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: |
@@ -70,6 +69,107 @@ jobs:
7069
- name: base
7170
run: |
7271
make base
72+
- name: release-notes
73+
if: startsWith(github.ref, 'refs/tags/')
74+
run: |
75+
make release-notes
76+
- name: Release
77+
if: startsWith(github.ref, 'refs/tags/')
78+
uses: softprops/action-gh-release@v2
79+
with:
80+
body_path: _out/RELEASE_NOTES.md
81+
draft: "true"
82+
lint:
83+
runs-on:
84+
group: generic
85+
if: github.event_name == 'pull_request'
86+
needs:
87+
- default
88+
steps:
89+
- name: gather-system-info
90+
id: system-info
91+
uses: kenchan0130/actions-system-info@v1.4.0
92+
continue-on-error: true
93+
- name: print-system-info
94+
run: |
95+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
96+
97+
OUTPUTS=(
98+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
99+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
100+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
101+
"NodeName: ${NODE_NAME}"
102+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
103+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
104+
"Name: ${{ steps.system-info.outputs.name }}"
105+
"Platform: ${{ steps.system-info.outputs.platform }}"
106+
"Release: ${{ steps.system-info.outputs.release }}"
107+
"Total memory: ${MEMORY_GB} GB"
108+
)
109+
110+
for OUTPUT in "${OUTPUTS[@]}";do
111+
echo "${OUTPUT}"
112+
done
113+
continue-on-error: true
114+
- name: checkout
115+
uses: actions/checkout@v5
116+
- name: Unshallow
117+
run: |
118+
git fetch --prune --unshallow
119+
- name: Set up Docker Buildx
120+
id: setup-buildx
121+
uses: docker/setup-buildx-action@v3
122+
with:
123+
driver: remote
124+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
125+
timeout-minutes: 10
126+
- name: lint
127+
run: |
128+
make lint
129+
unit-tests:
130+
runs-on:
131+
group: generic
132+
if: github.event_name == 'pull_request'
133+
needs:
134+
- default
135+
steps:
136+
- name: gather-system-info
137+
id: system-info
138+
uses: kenchan0130/actions-system-info@v1.4.0
139+
continue-on-error: true
140+
- name: print-system-info
141+
run: |
142+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
143+
144+
OUTPUTS=(
145+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
146+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
147+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
148+
"NodeName: ${NODE_NAME}"
149+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
150+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
151+
"Name: ${{ steps.system-info.outputs.name }}"
152+
"Platform: ${{ steps.system-info.outputs.platform }}"
153+
"Release: ${{ steps.system-info.outputs.release }}"
154+
"Total memory: ${MEMORY_GB} GB"
155+
)
156+
157+
for OUTPUT in "${OUTPUTS[@]}";do
158+
echo "${OUTPUT}"
159+
done
160+
continue-on-error: true
161+
- name: checkout
162+
uses: actions/checkout@v5
163+
- name: Unshallow
164+
run: |
165+
git fetch --prune --unshallow
166+
- name: Set up Docker Buildx
167+
id: setup-buildx
168+
uses: docker/setup-buildx-action@v3
169+
with:
170+
driver: remote
171+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
172+
timeout-minutes: 10
73173
- name: unit-tests
74174
run: |
75175
make unit-tests
@@ -80,18 +180,6 @@ jobs:
80180
uses: codecov/codecov-action@v5
81181
with:
82182
files: _out/coverage-unit-tests.txt
183+
flags: unit-tests
83184
token: ${{ secrets.CODECOV_TOKEN }}
84185
timeout-minutes: 3
85-
- name: lint
86-
run: |
87-
make lint
88-
- name: release-notes
89-
if: startsWith(github.ref, 'refs/tags/')
90-
run: |
91-
make release-notes
92-
- name: Release
93-
if: startsWith(github.ref, 'refs/tags/')
94-
uses: crazy-max/ghaction-github-release@v2
95-
with:
96-
body_path: _out/RELEASE_NOTES.md
97-
draft: "true"

‎.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-28T10:42:20Z by kres 4a927f7.
3+
# Generated on 2025-10-24T13:46:55Z by kres 46e133d.
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-28T10:42:20Z by kres 4a927f7.
3+
# Generated on 2025-10-24T13:46:55Z by kres 46e133d.
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-07-16T16:17:59Z by kres b869533.
3+
# Generated on 2025-10-24T13:46:55Z by kres 46e133d.
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.1.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"

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# syntax = docker/dockerfile-upstream:1.17.1-labs
1+
# syntax = docker/dockerfile-upstream:1.19.0-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2025-08-28T10:42:20Z by kres 4a927f7.
5+
# Generated on 2025-10-24T13:46:55Z by kres 46e133d.
66

77
ARG TOOLCHAIN
88

99
# cleaned up specs and compiled versions
1010
FROM scratch AS generate
1111

1212
# runs markdownlint
13-
FROM docker.io/oven/bun:1.2.20-alpine AS lint-markdown
13+
FROM docker.io/oven/bun:1.3.0-alpine AS lint-markdown
1414
WORKDIR /src
1515
RUN bun i markdownlint-cli@0.45.0 sentences-per-line@0.3.0
1616
COPY .markdownlint.json .

‎Makefile‎

Lines changed: 10 additions & 7 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-28T10:42:20Z by kres 4a927f7.
3+
# Generated on 2025-10-24T13:46:55Z by kres 46e133d.
44

55
# common variables
66

@@ -17,16 +17,16 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.36.7
20+
PROTOBUF_GO_VERSION ?= 1.36.10
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.27.1
22+
GRPC_GATEWAY_VERSION ?= 2.27.3
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.36.0
24+
GOIMPORTS_VERSION ?= 0.38.0
2525
GOMOCK_VERSION ?= 0.6.0
2626
DEEPCOPY_VERSION ?= v0.5.8
27-
GOLANGCILINT_VERSION ?= v2.4.0
28-
GOFUMPT_VERSION ?= v0.8.0
29-
GO_VERSION ?= 1.25.0
27+
GOLANGCILINT_VERSION ?= v2.5.0
28+
GOFUMPT_VERSION ?= v0.9.1
29+
GO_VERSION ?= 1.25.3
3030
GO_BUILDFLAGS ?=
3131
GO_LDFLAGS ?=
3232
CGO_ENABLED ?= 0
@@ -202,6 +202,9 @@ lint-markdown: ## Runs markdownlint.
202202
.PHONY: lint
203203
lint: lint-golangci-lint lint-gofumpt lint-govulncheck lint-markdown ## Run all linters for the project.
204204

205+
.PHONY: lint-fmt
206+
lint-fmt: lint-golangci-lint-fmt ## Run all linter formatters and fix up the source tree.
207+
205208
.PHONY: rekres
206209
rekres:
207210
@docker pull $(KRES_IMAGE)

‎kubernetes/upgrade/checks.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@ func NewChecks(path *Path, state state.State, k8sConfig *rest.Config, controlPla
289289
},
290290
},
291291
},
292+
"1.34->1.35": {
293+
// [TODO]: fill in removed feature gates and flags when 1.35 goes beta
294+
},
292295
},
293296
}, nil
294297
}

‎kubernetes/upgrade/path.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ func (p *Path) IsSupported() bool {
8888
"1.32->1.33",
8989
"1.33->1.33",
9090
"1.33->1.34",
91-
"1.34->1.34":
91+
"1.34->1.34",
92+
"1.34->1.35",
93+
"1.35->1.35":
9294
return true
9395
}
9496

0 commit comments

Comments
 (0)