Skip to content

Commit ad22df5

Browse files
authored
feat(deps): upgrading k8s.io packages to 0.31.2 (#570)
* chore(go): upgranding to 1.23 Signed-off-by: Dario Tranchitella <dario@tranchitella.eu> * feat(deps): upgrading k8s to v0.31.2 Signed-off-by: Dario Tranchitella <dario@tranchitella.eu> * chore(golangci-lint): upgrading to v1.61.0 Signed-off-by: Dario Tranchitella <dario@tranchitella.eu> * chore(dependabot): group by k8s.io packages Signed-off-by: Dario Tranchitella <dario@tranchitella.eu> --------- Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>
1 parent 4ae014c commit ad22df5

File tree

11 files changed

+124
-145
lines changed

11 files changed

+124
-145
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ updates:
77
rebase-strategy: disabled
88
commit-message:
99
prefix: "feat(deps)"
10+
groups:
11+
arrow:
12+
patterns:
13+
- "k8s.io*"
1014
- package-ecosystem: github-actions
1115
directory: /
1216
schedule:

.github/workflows/lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
- name: Install Go
2020
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
2121
with:
22-
go-version: '1.21'
22+
go-version-file: go.mod
2323
cache: false
2424
- name: Run golangci-lint
2525
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
2626
with:
27-
version: v1.55.2
27+
version: v1.61.0
2828
only-new-issues: false
2929
args: --timeout 5m --config .golangci.yml

.golangci.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
linters-settings:
2-
govet:
3-
check-shadowing: true
42
gci:
53
sections:
64
- standard
@@ -22,23 +20,21 @@ linters:
2220
- ireturn
2321
- varnamelen
2422
- wrapcheck
25-
- interfacer
26-
- maligned
27-
- golint
28-
- scopelint
2923
- gomnd
30-
- goerr113
31-
- exhaustivestruct
3224
- lll
33-
- ifshort
34-
- deadcode
35-
- structcheck
36-
- varcheck
37-
- nosnakecase
3825
- nonamedreturns
3926
- tparallel
4027
- nilerr
4128
- exhaustruct
4229
- depguard
43-
service:
44-
golangci-lint-version: 1.55.x
30+
# should be enabled
31+
- revive
32+
- err113
33+
- mnd
34+
- nilnil
35+
- wsl
36+
- perfsprint
37+
38+
# deprecated
39+
- exportloopref
40+
- execinquery

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21 as builder
1+
FROM golang:1.23 as builder
22
WORKDIR /workspace
33
COPY go.mod go.mod
44
COPY go.sum go.sum
@@ -11,7 +11,7 @@ ARG TARGETARCH
1111
ARG LDFLAGS=""
1212
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -trimpath -ldflags="${LDFLAGS}" -gcflags "${GCFLAGS}" -a -o capsule-proxy main.go
1313

14-
FROM golang:1.21 as dlv
14+
FROM golang:1.23 as dlv
1515
RUN CGO_ENABLED=0 go install github.com/go-delve/delve/cmd/dlv@latest
1616
WORKDIR /
1717
COPY --from=builder /workspace/capsule-proxy .

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ mkcert: ## Download mkcert locally if necessary.
264264
$(call go-install-tool,$(MKCERT),filippo.io/mkcert@$(MKCERT_VERSION))
265265

266266
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
267-
GOLANGCI_LINT_VERSION = v1.55.2
267+
GOLANGCI_LINT_VERSION = v1.61.0
268268
golangci-lint: ## Download golangci-lint locally if necessary.
269269
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION))
270270

go.mod

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/projectcapsule/capsule-proxy
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
github.com/go-logr/logr v1.4.2
@@ -9,67 +9,67 @@ require (
99
github.com/gorilla/mux v1.8.1
1010
github.com/pkg/errors v0.9.1
1111
github.com/projectcapsule/capsule v0.5.0
12-
github.com/prometheus/client_golang v1.17.0
12+
github.com/prometheus/client_golang v1.19.1
1313
github.com/prometheus/client_model v0.6.1
1414
github.com/spf13/pflag v1.0.5
1515
github.com/thediveo/enumflag v0.10.1
1616
go.uber.org/zap v1.27.0
1717
golang.org/x/net v0.30.0
18-
k8s.io/api v0.28.4
19-
k8s.io/apiextensions-apiserver v0.28.4
20-
k8s.io/apimachinery v0.29.2
21-
k8s.io/apiserver v0.28.4
22-
k8s.io/client-go v0.28.4
23-
k8s.io/component-base v0.28.4
24-
sigs.k8s.io/controller-runtime v0.16.5
18+
k8s.io/api v0.31.2
19+
k8s.io/apiextensions-apiserver v0.31.2
20+
k8s.io/apimachinery v0.31.2
21+
k8s.io/apiserver v0.31.2
22+
k8s.io/client-go v0.31.2
23+
k8s.io/component-base v0.31.2
24+
sigs.k8s.io/controller-runtime v0.19.1
2525
)
2626

2727
require (
2828
github.com/beorn7/perks v1.0.1 // indirect
2929
github.com/blang/semver/v4 v4.0.0 // indirect
30-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
30+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3131
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3232
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
33-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
34-
github.com/felixge/httpsnoop v1.0.3 // indirect
35-
github.com/fsnotify/fsnotify v1.6.0 // indirect
36-
github.com/go-logr/zapr v1.2.4 // indirect
33+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
34+
github.com/felixge/httpsnoop v1.0.4 // indirect
35+
github.com/fsnotify/fsnotify v1.7.0 // indirect
36+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
37+
github.com/go-logr/zapr v1.3.0 // indirect
3738
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3839
github.com/go-openapi/jsonreference v0.20.2 // indirect
39-
github.com/go-openapi/swag v0.22.3 // indirect
40+
github.com/go-openapi/swag v0.22.4 // indirect
4041
github.com/gogo/protobuf v1.3.2 // indirect
4142
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
42-
github.com/golang/protobuf v1.5.3 // indirect
43+
github.com/golang/protobuf v1.5.4 // indirect
4344
github.com/google/gnostic-models v0.6.8 // indirect
4445
github.com/google/go-cmp v0.6.0 // indirect
4546
github.com/google/gofuzz v1.2.0 // indirect
46-
github.com/google/uuid v1.3.1 // indirect
47+
github.com/google/uuid v1.6.0 // indirect
4748
github.com/imdario/mergo v0.3.13 // indirect
4849
github.com/josharian/intern v1.0.0 // indirect
4950
github.com/json-iterator/go v1.1.12 // indirect
5051
github.com/mailru/easyjson v0.7.7 // indirect
51-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5252
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5353
github.com/modern-go/reflect2 v1.0.2 // indirect
5454
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
55-
github.com/prometheus/common v0.44.0 // indirect
56-
github.com/prometheus/procfs v0.11.1 // indirect
55+
github.com/prometheus/common v0.55.0 // indirect
56+
github.com/prometheus/procfs v0.15.1 // indirect
57+
github.com/x448/float16 v0.8.4 // indirect
5758
go.uber.org/multierr v1.11.0 // indirect
5859
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
59-
golang.org/x/oauth2 v0.14.0 // indirect
60+
golang.org/x/oauth2 v0.21.0 // indirect
6061
golang.org/x/sys v0.26.0 // indirect
6162
golang.org/x/term v0.25.0 // indirect
6263
golang.org/x/text v0.19.0 // indirect
6364
golang.org/x/time v0.3.0 // indirect
6465
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
65-
google.golang.org/appengine v1.6.7 // indirect
66-
google.golang.org/protobuf v1.33.0 // indirect
66+
google.golang.org/protobuf v1.34.2 // indirect
6767
gopkg.in/inf.v0 v0.9.1 // indirect
6868
gopkg.in/yaml.v2 v2.4.0 // indirect
6969
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/klog/v2 v2.110.1 // indirect
71-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
72-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
70+
k8s.io/klog/v2 v2.130.1 // indirect
71+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
72+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
7373
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7474
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7575
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)