Skip to content

Commit d9f0c5f

Browse files
smirasmira
committed
feat: update dependencies for Talos 1.9
Mostly just bumping Talos and rekres. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent d888b32 commit d9f0c5f

File tree

7 files changed

+135
-131
lines changed

7 files changed

+135
-131
lines changed

‎.github/workflows/slack-notify.yaml‎

Lines changed: 5 additions & 5 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 2023-12-11T14:28:13Z by kres latest.
3+
# Generated on 2024-12-04T11:31:51Z by kres 232fe63.
44

55
name: slack-notify
66
"on":
@@ -24,11 +24,12 @@ jobs:
2424
run: |
2525
echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
2626
- name: Slack Notify
27-
uses: slackapi/slack-github-action@v1
27+
uses: slackapi/slack-github-action@v2
2828
with:
29-
channel-id: proj-talos-maintainers
29+
method: chat.postMessage
3030
payload: |
3131
{
32+
"channel": "proj-talos-maintainers",
3233
"attachments": [
3334
{
3435
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
@@ -88,5 +89,4 @@ jobs:
8889
}
8990
]
9091
}
91-
env:
92-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
92+
token: ${{ secrets.SLACK_BOT_TOKEN }}

‎.golangci.yml‎

Lines changed: 1 addition & 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 2024-09-10T13:25:06Z by kres 8be5fa7.
3+
# Generated on 2024-12-04T11:31:51Z by kres 232fe63.
44

55
# options for analysis running
66
run:
@@ -116,7 +116,6 @@ linters:
116116
- gochecknoglobals
117117
- gochecknoinits
118118
- godox
119-
- gomnd
120119
- gomoddirectives
121120
- gosec
122121
- inamedparam

‎Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# syntax = docker/dockerfile-upstream:1.9.0-labs
1+
# syntax = docker/dockerfile-upstream:1.11.1-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-09-10T13:25:06Z by kres 8be5fa7.
5+
# Generated on 2024-12-04T11:31:51Z by kres 232fe63.
66

77
ARG TOOLCHAIN
88

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

12-
FROM ghcr.io/siderolabs/ca-certificates:v1.7.0 AS image-ca-certificates
12+
FROM ghcr.io/siderolabs/ca-certificates:v1.8.0 AS image-ca-certificates
1313

14-
FROM ghcr.io/siderolabs/fhs:v1.7.0 AS image-fhs
14+
FROM ghcr.io/siderolabs/fhs:v1.8.0 AS image-fhs
1515

1616
# runs markdownlint
17-
FROM docker.io/oven/bun:1.1.26-alpine AS lint-markdown
17+
FROM docker.io/oven/bun:1.1.36-alpine AS lint-markdown
1818
WORKDIR /src
19-
RUN bun i markdownlint-cli@0.41.0 [email protected]
19+
RUN bun i markdownlint-cli@0.43.0 [email protected]
2020
COPY .markdownlint.json .
2121
COPY ./README.md ./README.md
2222
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .

‎Makefile‎

Lines changed: 17 additions & 6 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 2024-09-10T13:25:06Z by kres 8be5fa7.
3+
# Generated on 2024-12-04T11:31:51Z by kres 232fe63.
44

55
# common variables
66

@@ -17,15 +17,15 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.34.2
20+
PROTOBUF_GO_VERSION ?= 1.35.2
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.22.0
22+
GRPC_GATEWAY_VERSION ?= 2.24.0
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.24.0
24+
GOIMPORTS_VERSION ?= 0.27.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.60.3
26+
GOLANGCILINT_VERSION ?= v1.62.0
2727
GOFUMPT_VERSION ?= v0.7.0
28-
GO_VERSION ?= 1.23.0
28+
GO_VERSION ?= 1.23.3
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0
@@ -41,11 +41,13 @@ PLATFORM ?= linux/amd64
4141
PROGRESS ?= auto
4242
PUSH ?= false
4343
CI_ARGS ?=
44+
BUILDKIT_MULTI_PLATFORM ?= 1
4445
COMMON_ARGS = --file=Dockerfile
4546
COMMON_ARGS += --provenance=false
4647
COMMON_ARGS += --progress=$(PROGRESS)
4748
COMMON_ARGS += --platform=$(PLATFORM)
4849
COMMON_ARGS += --push=$(PUSH)
50+
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
4951
COMMON_ARGS += --build-arg=ARTIFACTS="$(ARTIFACTS)"
5052
COMMON_ARGS += --build-arg=SHA="$(SHA)"
5153
COMMON_ARGS += --build-arg=TAG="$(TAG)"
@@ -145,6 +147,15 @@ target-%: ## Builds the specified target defined in the Dockerfile. The build r
145147

146148
local-%: ## Builds the specified target defined in the Dockerfile using the local output type. The build result will be output to the specified local destination.
147149
@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
150+
@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
151+
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
152+
echo $$platform; \
153+
directory="$${platform//\//_}"; \
154+
if [[ -d "$$DEST/$$directory" ]]; then \
155+
mv "$$DEST/$$directory/"* $$DEST; \
156+
rmdir "$$DEST/$$directory/"; \
157+
fi; \
158+
done'
148159

149160
lint-golangci-lint: ## Runs golangci-lint linter.
150161
@$(MAKE) target-$@

‎go.mod‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
11
module github.com/siderolabs/capi-utils
22

3-
go 1.22.7
3+
go 1.23.3
44

55
require (
66
github.com/siderolabs/go-debug v0.4.0
77
github.com/siderolabs/go-retry v0.3.3
8-
github.com/siderolabs/talos/pkg/machinery v1.8.0-beta.0
8+
github.com/siderolabs/talos/pkg/machinery v1.9.0-beta.0
99
github.com/spf13/cobra v1.8.1
1010
github.com/spf13/viper v1.19.0
11-
google.golang.org/grpc v1.66.0
12-
k8s.io/api v0.31.0
13-
k8s.io/apimachinery v0.31.0
14-
k8s.io/client-go v0.31.0
15-
sigs.k8s.io/cluster-api v1.8.2
16-
sigs.k8s.io/controller-runtime v0.19.0
11+
google.golang.org/grpc v1.68.0
12+
k8s.io/api v0.31.3
13+
k8s.io/apimachinery v0.31.3
14+
k8s.io/client-go v0.31.3
15+
sigs.k8s.io/cluster-api v1.8.5
16+
sigs.k8s.io/controller-runtime v0.19.3
1717
)
1818

1919
require (
20+
cel.dev/expr v0.18.0 // indirect
2021
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2122
github.com/Masterminds/goutils v1.1.1 // indirect
2223
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2324
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
24-
github.com/ProtonMail/go-crypto v1.1.0-alpha.5.0.20240827111422-b5837fa4476e // indirect
25+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
2526
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
26-
github.com/ProtonMail/gopenpgp/v2 v2.7.5 // indirect
27-
github.com/adrg/xdg v0.5.0 // indirect
28-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
27+
github.com/ProtonMail/gopenpgp/v2 v2.8.1 // indirect
28+
github.com/adrg/xdg v0.5.3 // indirect
29+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2930
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/blang/semver/v4 v4.0.0 // indirect
3233
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3334
github.com/cespare/xxhash/v2 v2.3.0 // indirect
34-
github.com/cloudflare/circl v1.3.9 // indirect
35+
github.com/cloudflare/circl v1.5.0 // indirect
3536
github.com/containerd/go-cni v1.1.10 // indirect
3637
github.com/containernetworking/cni v1.2.3 // indirect
37-
github.com/cosi-project/runtime v0.5.5 // indirect
38+
github.com/cosi-project/runtime v0.7.2 // indirect
3839
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3940
github.com/distribution/reference v0.6.0 // indirect
4041
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -53,14 +54,14 @@ require (
5354
github.com/gogo/protobuf v1.3.2 // indirect
5455
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5556
github.com/golang/protobuf v1.5.4 // indirect
56-
github.com/google/cel-go v0.21.0 // indirect
57+
github.com/google/cel-go v0.22.1 // indirect
5758
github.com/google/gnostic-models v0.6.8 // indirect
5859
github.com/google/go-cmp v0.6.0 // indirect
5960
github.com/google/go-github/v53 v53.2.0 // indirect
6061
github.com/google/go-querystring v1.1.0 // indirect
6162
github.com/google/gofuzz v1.2.0 // indirect
6263
github.com/google/uuid v1.6.0 // indirect
63-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
64+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
6465
github.com/hashicorp/errwrap v1.1.0 // indirect
6566
github.com/hashicorp/go-multierror v1.1.1 // indirect
6667
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -83,24 +84,24 @@ require (
8384
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
8485
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
8586
github.com/pkg/errors v0.9.1 // indirect
86-
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
87+
github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2 // indirect
8788
github.com/prometheus/client_golang v1.19.1 // indirect
8889
github.com/prometheus/client_model v0.6.1 // indirect
8990
github.com/prometheus/common v0.55.0 // indirect
9091
github.com/prometheus/procfs v0.15.1 // indirect
9192
github.com/sagikazarmark/locafero v0.4.0 // indirect
9293
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
9394
github.com/shopspring/decimal v1.3.1 // indirect
94-
github.com/siderolabs/crypto v0.4.4 // indirect
95-
github.com/siderolabs/gen v0.5.0 // indirect
95+
github.com/siderolabs/crypto v0.5.0 // indirect
96+
github.com/siderolabs/gen v0.7.0 // indirect
9697
github.com/siderolabs/go-api-signature v0.3.6 // indirect
9798
github.com/siderolabs/go-pointer v1.0.0 // indirect
9899
github.com/siderolabs/protoenc v0.2.1 // indirect
99100
github.com/sourcegraph/conc v0.3.0 // indirect
100101
github.com/spf13/afero v1.11.0 // indirect
101102
github.com/spf13/cast v1.6.0 // indirect
102103
github.com/spf13/pflag v1.0.5 // indirect
103-
github.com/stoewer/go-strcase v1.2.0 // indirect
104+
github.com/stoewer/go-strcase v1.3.0 // indirect
104105
github.com/subosito/gotenv v1.6.0 // indirect
105106
github.com/valyala/fastjson v1.6.4 // indirect
106107
github.com/x448/float16 v0.8.4 // indirect
@@ -114,19 +115,19 @@ require (
114115
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
115116
go.uber.org/multierr v1.11.0 // indirect
116117
go.uber.org/zap v1.27.0 // indirect
117-
golang.org/x/crypto v0.26.0 // indirect
118-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
119-
golang.org/x/net v0.28.0 // indirect
120-
golang.org/x/oauth2 v0.22.0 // indirect
121-
golang.org/x/sync v0.8.0 // indirect
122-
golang.org/x/sys v0.24.0 // indirect
123-
golang.org/x/term v0.23.0 // indirect
124-
golang.org/x/text v0.17.0 // indirect
125-
golang.org/x/time v0.6.0 // indirect
118+
golang.org/x/crypto v0.29.0 // indirect
119+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
120+
golang.org/x/net v0.31.0 // indirect
121+
golang.org/x/oauth2 v0.24.0 // indirect
122+
golang.org/x/sync v0.9.0 // indirect
123+
golang.org/x/sys v0.27.0 // indirect
124+
golang.org/x/term v0.26.0 // indirect
125+
golang.org/x/text v0.20.0 // indirect
126+
golang.org/x/time v0.8.0 // indirect
126127
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
127-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
128-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
129-
google.golang.org/protobuf v1.34.2 // indirect
128+
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
129+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
130+
google.golang.org/protobuf v1.35.2 // indirect
130131
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
131132
gopkg.in/inf.v0 v0.9.1 // indirect
132133
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)