Skip to content

Commit c27ec10

Browse files
committed
chore: rekres, bump dependencies
Update Go modules. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 1884166 commit c27ec10

File tree

7 files changed

+126
-117
lines changed

7 files changed

+126
-117
lines changed

.conform.yaml

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,48 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2022-08-25T08:24:11Z by kres latest.
3+
# Generated on 2024-02-28T14:47:03Z by kres latest.
44

5-
---
65
policies:
7-
- type: commit
8-
spec:
9-
dco: true
10-
gpg:
11-
required: true
12-
identity:
13-
gitHubOrganization: cosi-project
14-
spellcheck:
15-
locale: US
16-
maximumOfOneCommit: true
17-
header:
18-
length: 89
19-
imperative: true
20-
case: lower
21-
invalidLastCharacters: .
22-
body:
23-
required: true
24-
conventional:
25-
types: ["chore","docs","perf","refactor","style","test","release"]
26-
scopes: [".*"]
27-
- type: license
28-
spec:
29-
skipPaths:
30-
- .git/
31-
- testdata/
32-
includeSuffixes:
33-
- .go
34-
excludeSuffixes:
35-
- .pb.go
36-
- .pb.gw.go
37-
header: "// This Source Code Form is subject to the terms of the Mozilla Public\u000A// License, v. 2.0. If a copy of the MPL was not distributed with this\u000A// file, You can obtain one at http://mozilla.org/MPL/2.0/.\u000A"
6+
- type: commit
7+
spec:
8+
dco: true
9+
gpg:
10+
required: true
11+
identity:
12+
gitHubOrganization: cosi-project
13+
spellcheck:
14+
locale: US
15+
maximumOfOneCommit: true
16+
header:
17+
length: 89
18+
imperative: true
19+
case: lower
20+
invalidLastCharacters: .
21+
body:
22+
required: true
23+
conventional:
24+
types:
25+
- chore
26+
- docs
27+
- perf
28+
- refactor
29+
- style
30+
- test
31+
- release
32+
scopes:
33+
- .*
34+
- type: license
35+
spec:
36+
root: .
37+
skipPaths:
38+
- .git/
39+
- testdata/
40+
includeSuffixes:
41+
- .go
42+
excludeSuffixes:
43+
- .pb.go
44+
- .pb.gw.go
45+
header: |
46+
// This Source Code Form is subject to the terms of the Mozilla Public
47+
// License, v. 2.0. If a copy of the MPL was not distributed with this
48+
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

.drone.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
33
#
4-
# Generated on 2023-11-01T20:14:53Z by kres latest.
4+
# Generated on 2024-02-28T14:47:03Z by kres latest.
55

66
kind: pipeline
77
type: kubernetes
@@ -68,11 +68,11 @@ steps:
6868
depends_on:
6969
- base
7070

71-
- name: unit-tests-race
71+
- name: unit-tests%!(EXTRA string=-race)
7272
pull: always
7373
image: autonomy/build-container:latest
7474
commands:
75-
- make unit-tests-race
75+
- make unit-tests%!(EXTRA string=-race)
7676
volumes:
7777
- name: outer-docker-socket
7878
path: /var/outer-run
@@ -174,7 +174,7 @@ steps:
174174

175175
services:
176176
- name: docker
177-
image: docker:24.0-dind
177+
image: docker:25.0-dind
178178
entrypoint:
179179
- dockerd
180180
commands:

.golangci.yml

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 2023-11-01T15:40:21Z by kres latest.
3+
# Generated on 2024-02-28T14:47:03Z by kres latest.
44

55
# options for analysis running
66
run:
@@ -74,8 +74,6 @@ linters-settings:
7474
govet:
7575
check-shadowing: true
7676
enable-all: true
77-
disable:
78-
- loopclosure
7977
lll:
8078
line-length: 200
8179
tab-width: 4
@@ -153,6 +151,7 @@ linters:
153151
- inamedparam
154152
- testifylint # complains about our assert recorder and has a number of false positives for assert.Greater(t, thing, 1)
155153
- protogetter # complains about us using Value field on typed spec, instead of GetValue which has a different signature
154+
- perfsprint # complains about us using fmt.Sprintf in non-performance critical code, updating just kres took too long
156155
# abandoned linters for which golangci shows the warning that the repo is archived by the owner
157156
- interfacer
158157
- maligned

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-01-25T15:46:04Z by kres latest.
5+
# Generated on 2024-02-28T14:47:03Z by kres latest.
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/node:21.5.0-alpine3.19 AS lint-markdown
13+
FROM docker.io/node:21.6.2-alpine3.19 AS lint-markdown
1414
WORKDIR /src
15-
RUN npm i -g markdownlint-cli@0.38.0
15+
RUN npm i -g markdownlint-cli@0.39.0
1616
RUN npm i sentences-per-line@0.2.1
1717
COPY .markdownlint.json .
1818
COPY ./README.md ./README.md

Makefile

Lines changed: 11 additions & 12 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-01-25T15:46:04Z by kres latest.
3+
# Generated on 2024-02-28T14:47:03Z by kres latest.
44

55
# common variables
66

@@ -16,18 +16,17 @@ USERNAME ?= cosi-project
1616
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
1717
PROTOBUF_GO_VERSION ?= 1.32.0
1818
GRPC_GO_VERSION ?= 1.3.0
19-
GRPC_GATEWAY_VERSION ?= 2.19.0
20-
VTPROTOBUF_VERSION ?= 0.5.0
21-
DEEPCOPY_VERSION ?= v0.5.5
22-
GOLANGCILINT_VERSION ?= v1.55.2
23-
GOFUMPT_VERSION ?= v0.5.0
24-
GO_VERSION ?= 1.21.6
25-
GOIMPORTS_VERSION ?= v0.17.0
19+
GRPC_GATEWAY_VERSION ?= 2.19.1
20+
VTPROTOBUF_VERSION ?= 0.6.0
21+
DEEPCOPY_VERSION ?= v0.5.6
22+
GOLANGCILINT_VERSION ?= v1.56.2
23+
GOFUMPT_VERSION ?= v0.6.0
24+
GO_VERSION ?= 1.22.0
25+
GOIMPORTS_VERSION ?= v0.18.0
2626
GO_BUILDFLAGS ?=
2727
GO_LDFLAGS ?=
2828
CGO_ENABLED ?= 0
2929
GOTOOLCHAIN ?= local
30-
GOEXPERIMENT ?= loopvar
3130
TESTPKGS ?= ./...
3231
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
3332
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -65,7 +64,7 @@ COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
6564
COMMON_ARGS += --build-arg=GOIMPORTS_VERSION="$(GOIMPORTS_VERSION)"
6665
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
6766
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
68-
TOOLCHAIN ?= docker.io/golang:1.21-alpine
67+
TOOLCHAIN ?= docker.io/golang:1.22-alpine
6968

7069
# help menu
7170

@@ -126,7 +125,7 @@ endif
126125
ifneq (, $(filter $(WITH_DEBUG), t true TRUE y yes 1))
127126
GO_BUILDFLAGS += -tags sidero.debug
128127
else
129-
GO_LDFLAGS += -s -w
128+
GO_LDFLAGS += -s
130129
endif
131130

132131
all: unit-tests lint
@@ -150,7 +149,7 @@ lint-gofumpt: ## Runs gofumpt linter.
150149
.PHONY: fmt
151150
fmt: ## Formats the source code
152151
@docker run --rm -it -v $(PWD):/src -w /src golang:$(GO_VERSION) \
153-
bash -c "export GOEXPERIMENT=loopvar; export GOTOOLCHAIN=local; \
152+
bash -c "export GOTOOLCHAIN=local; \
154153
export GO111MODULE=on; export GOPROXY=https://proxy.golang.org; \
155154
go install mvdan.cc/gofumpt@$(GOFUMPT_VERSION) && \
156155
gofumpt -w ."

go.mod

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module github.com/cosi-project/state-etcd
22

3-
go 1.21.6
3+
go 1.22.0
44

55
require (
6-
github.com/cosi-project/runtime v0.4.0-alpha.2
6+
github.com/cosi-project/runtime v0.4.0-alpha.8
77
github.com/siderolabs/gen v0.4.7
88
github.com/stretchr/testify v1.8.4
9-
go.etcd.io/etcd/api/v3 v3.5.11
10-
go.etcd.io/etcd/client/v3 v3.5.11
11-
go.etcd.io/etcd/server/v3 v3.5.11
9+
go.etcd.io/etcd/api/v3 v3.5.12
10+
go.etcd.io/etcd/client/v3 v3.5.12
11+
go.etcd.io/etcd/server/v3 v3.5.12
1212
go.uber.org/goleak v1.3.0
13-
google.golang.org/grpc v1.61.0
13+
google.golang.org/grpc v1.62.0
1414
)
1515

1616
require (
@@ -32,7 +32,7 @@ require (
3232
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
3333
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
3434
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
35-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
35+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
3636
github.com/jonboulle/clockwork v0.2.2 // indirect
3737
github.com/json-iterator/go v1.1.11 // indirect
3838
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
@@ -51,11 +51,11 @@ require (
5151
github.com/spf13/pflag v1.0.5 // indirect
5252
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
5353
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
54-
go.etcd.io/bbolt v1.3.8 // indirect
55-
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
56-
go.etcd.io/etcd/client/v2 v2.305.11 // indirect
57-
go.etcd.io/etcd/pkg/v3 v3.5.11 // indirect
58-
go.etcd.io/etcd/raft/v3 v3.5.11 // indirect
54+
go.etcd.io/bbolt v1.3.9 // indirect
55+
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
56+
go.etcd.io/etcd/client/v2 v2.305.12 // indirect
57+
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
58+
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
5959
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
6060
go.opentelemetry.io/otel v1.20.0 // indirect
6161
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
@@ -65,16 +65,16 @@ require (
6565
go.opentelemetry.io/otel/trace v1.20.0 // indirect
6666
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
6767
go.uber.org/multierr v1.10.0 // indirect
68-
go.uber.org/zap v1.26.0 // indirect
69-
golang.org/x/crypto v0.16.0 // indirect
70-
golang.org/x/net v0.19.0 // indirect
68+
go.uber.org/zap v1.27.0 // indirect
69+
golang.org/x/crypto v0.18.0 // indirect
70+
golang.org/x/net v0.20.0 // indirect
7171
golang.org/x/sync v0.6.0 // indirect
72-
golang.org/x/sys v0.15.0 // indirect
72+
golang.org/x/sys v0.16.0 // indirect
7373
golang.org/x/text v0.14.0 // indirect
7474
golang.org/x/time v0.5.0 // indirect
75-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
76-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
75+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
76+
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
77+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
7878
google.golang.org/protobuf v1.32.0 // indirect
7979
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
8080
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)