Skip to content

Commit 45b248c

Browse files
aramasearamase
authored
chore: update deps for v1.25.0 (#172)
Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
1 parent d1163d7 commit 45b248c

File tree

9 files changed

+133
-616
lines changed

9 files changed

+133
-616
lines changed

‎.golangci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ run:
44
linters:
55
disable-all: true
66
enable:
7-
- deadcode
87
- goconst
98
- gocyclo
109
- gofmt
@@ -18,6 +17,4 @@ linters:
1817
- prealloc
1918
- revive
2019
- staticcheck
21-
- structcheck
2220
- unused
23-
- varcheck

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ DOCKER_BUILDKIT = 1
2929
export DOCKER_BUILDKIT
3030

3131
# Testing var
32-
KIND_VERSION ?= 0.11.0
33-
KUBERNETES_VERSION ?= v1.21.1
32+
KIND_VERSION ?= 0.15.0
33+
KUBERNETES_VERSION ?= v1.25.0
3434
BATS_VERSION ?= 1.4.1
3535

3636
## --------------------------------------

‎cmd/server/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"google.golang.org/grpc"
2525
pb "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1"
26-
"k8s.io/component-base/config"
26+
logsapi "k8s.io/component-base/logs/api/v1"
2727
json "k8s.io/component-base/logs/json"
2828
"k8s.io/klog/v2"
2929
)
@@ -57,7 +57,7 @@ func main() {
5757

5858
if *logFormatJSON {
5959
jsonFactory := json.Factory{}
60-
logger, _ := jsonFactory.Create(config.LoggingConfiguration{Format: "json"})
60+
logger, _ := jsonFactory.Create(logsapi.LoggingConfiguration{Format: "json"})
6161
klog.SetLogger(logger)
6262
}
6363

‎go.mod

+16-14
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ require (
1010
go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0
1111
go.opentelemetry.io/otel/metric v0.20.0
1212
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
13-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
14-
google.golang.org/grpc v1.48.0
13+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
14+
google.golang.org/grpc v1.49.0
1515
gopkg.in/yaml.v3 v3.0.1
16-
k8s.io/apiserver v0.24.4
17-
k8s.io/component-base v0.24.4
18-
k8s.io/klog/v2 v2.70.1
16+
k8s.io/apiserver v0.25.1
17+
k8s.io/component-base v0.25.1
18+
k8s.io/klog/v2 v2.80.1
1919
)
2020

2121
require (
@@ -27,12 +27,13 @@ require (
2727
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2828
github.com/beorn7/perks v1.0.1 // indirect
2929
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30-
github.com/go-logr/logr v1.2.0 // indirect
31-
github.com/go-logr/zapr v1.2.0 // indirect
30+
github.com/go-logr/logr v1.2.3 // indirect
31+
github.com/go-logr/zapr v1.2.3 // indirect
3232
github.com/gogo/protobuf v1.3.2 // indirect
3333
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
3434
github.com/golang/protobuf v1.5.2 // indirect
3535
github.com/google/gofuzz v1.1.0 // indirect
36+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
3637
github.com/json-iterator/go v1.1.12 // indirect
3738
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
3839
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -41,6 +42,7 @@ require (
4142
github.com/prometheus/client_model v0.2.0 // indirect
4243
github.com/prometheus/common v0.32.1 // indirect
4344
github.com/prometheus/procfs v0.7.3 // indirect
45+
github.com/spf13/cobra v1.4.0 // indirect
4446
github.com/spf13/pflag v1.0.5 // indirect
4547
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
4648
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
@@ -49,14 +51,14 @@ require (
4951
go.uber.org/atomic v1.7.0 // indirect
5052
go.uber.org/multierr v1.6.0 // indirect
5153
go.uber.org/zap v1.19.0 // indirect
52-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
54+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
5355
golang.org/x/text v0.3.7 // indirect
54-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
55-
google.golang.org/protobuf v1.27.1 // indirect
56+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
57+
google.golang.org/protobuf v1.28.0 // indirect
5658
gopkg.in/inf.v0 v0.9.1 // indirect
5759
gopkg.in/yaml.v2 v2.4.0 // indirect
58-
k8s.io/apimachinery v0.24.4 // indirect
59-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
60-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
61-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
60+
k8s.io/apimachinery v0.25.1 // indirect
61+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
62+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
63+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6264
)

‎go.sum

+34-290
Large diffs are not rendered by default.

‎pkg/metrics/prometheus_exporter.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"net/http"
66
"os"
7+
"time"
78

89
"go.opentelemetry.io/otel/exporters/metric/prometheus"
910
"k8s.io/klog/v2"
@@ -25,7 +26,11 @@ func initPrometheusExporter(metricsAddress string) error {
2526

2627
http.HandleFunc(fmt.Sprintf("/%s", metricsEndpoint), exporter.ServeHTTP)
2728
go func() {
28-
if err := http.ListenAndServe(fmt.Sprintf(":%s", metricsAddress), nil); err != nil {
29+
server := &http.Server{
30+
Addr: fmt.Sprintf(":%s", metricsAddress),
31+
ReadHeaderTimeout: 5 * time.Second,
32+
}
33+
if err := server.ListenAndServe(); err != nil {
2934
klog.ErrorS(err, "failed to register prometheus endpoint", "metricsAddress", metricsAddress)
3035
os.Exit(1)
3136
}

‎pkg/plugin/healthz.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ type HealthZ struct {
3737
func (h *HealthZ) Serve() {
3838
serveMux := http.NewServeMux()
3939
serveMux.HandleFunc(h.HealthCheckURL.EscapedPath(), h.ServeHTTP)
40-
if err := http.ListenAndServe(h.HealthCheckURL.Host, serveMux); err != nil && err != http.ErrServerClosed {
40+
server := &http.Server{
41+
Addr: h.HealthCheckURL.Host,
42+
ReadHeaderTimeout: 5 * time.Second,
43+
Handler: serveMux,
44+
}
45+
if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
4146
klog.ErrorS(err, "failed to start health check server", "url", h.HealthCheckURL.String())
4247
os.Exit(1)
4348
}

‎tools/go.mod

+20-16
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ module github.com/Azure/kubernetes-kms/tools
22

33
go 1.19
44

5-
require github.com/golangci/golangci-lint v1.48.0
5+
require github.com/golangci/golangci-lint v1.49.0
66

77
require (
88
4d63.com/gochecknoglobals v0.1.0 // indirect
99
github.com/Antonboom/errname v0.1.7 // indirect
1010
github.com/Antonboom/nilnil v0.1.1 // indirect
1111
github.com/BurntSushi/toml v1.2.0 // indirect
1212
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
13-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.2.2 // indirect
13+
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
1414
github.com/Masterminds/semver v1.5.0 // indirect
1515
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
1616
github.com/alexkohler/prealloc v1.0.0 // indirect
@@ -26,8 +26,9 @@ require (
2626
github.com/butuzov/ireturn v0.1.1 // indirect
2727
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2828
github.com/charithe/durationcheck v0.0.9 // indirect
29-
github.com/chavacava/garif v0.0.0-20220316182200-5cad0b5181d4 // indirect
30-
github.com/daixiang0/gci v0.6.2 // indirect
29+
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
30+
github.com/curioswitch/go-reassign v0.1.2 // indirect
31+
github.com/daixiang0/gci v0.6.3 // indirect
3132
github.com/davecgh/go-spew v1.1.1 // indirect
3233
github.com/denis-tingaikin/go-header v0.4.3 // indirect
3334
github.com/esimonov/ifshort v1.0.4 // indirect
@@ -37,10 +38,10 @@ require (
3738
github.com/firefart/nonamedreturns v1.0.4 // indirect
3839
github.com/fsnotify/fsnotify v1.5.4 // indirect
3940
github.com/fzipp/gocyclo v0.6.0 // indirect
40-
github.com/go-critic/go-critic v0.6.3 // indirect
41+
github.com/go-critic/go-critic v0.6.4 // indirect
4142
github.com/go-toolsmith/astcast v1.0.0 // indirect
42-
github.com/go-toolsmith/astcopy v1.0.0 // indirect
43-
github.com/go-toolsmith/astequal v1.0.1 // indirect
43+
github.com/go-toolsmith/astcopy v1.0.1 // indirect
44+
github.com/go-toolsmith/astequal v1.0.2 // indirect
4445
github.com/go-toolsmith/astfmt v1.0.0 // indirect
4546
github.com/go-toolsmith/astp v1.0.0 // indirect
4647
github.com/go-toolsmith/strparse v1.0.0 // indirect
@@ -86,12 +87,12 @@ require (
8687
github.com/magiconair/properties v1.8.6 // indirect
8788
github.com/maratori/testpackage v1.1.0 // indirect
8889
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
89-
github.com/mattn/go-colorable v0.1.12 // indirect
90-
github.com/mattn/go-isatty v0.0.14 // indirect
90+
github.com/mattn/go-colorable v0.1.13 // indirect
91+
github.com/mattn/go-isatty v0.0.16 // indirect
9192
github.com/mattn/go-runewidth v0.0.9 // indirect
9293
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
9394
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
94-
github.com/mgechev/revive v1.2.1 // indirect
95+
github.com/mgechev/revive v1.2.3 // indirect
9596
github.com/mitchellh/go-homedir v1.1.0 // indirect
9697
github.com/mitchellh/mapstructure v1.5.0 // indirect
9798
github.com/moricho/tparallel v0.2.1 // indirect
@@ -105,20 +106,21 @@ require (
105106
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
106107
github.com/pkg/errors v0.9.1 // indirect
107108
github.com/pmezard/go-difflib v1.0.0 // indirect
108-
github.com/polyfloyd/go-errorlint v1.0.0 // indirect
109+
github.com/polyfloyd/go-errorlint v1.0.2 // indirect
109110
github.com/prometheus/client_golang v1.12.1 // indirect
110111
github.com/prometheus/client_model v0.2.0 // indirect
111112
github.com/prometheus/common v0.32.1 // indirect
112113
github.com/prometheus/procfs v0.7.3 // indirect
113-
github.com/quasilyte/go-ruleguard v0.3.16-0.20220213074421-6aa060fab41a // indirect
114+
github.com/quasilyte/go-ruleguard v0.3.17 // indirect
114115
github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect
115116
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
116117
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
117118
github.com/ryancurrah/gomodguard v1.2.4 // indirect
118119
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
119120
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
120-
github.com/sashamelentyev/usestdlibvars v1.8.0 // indirect
121-
github.com/securego/gosec/v2 v2.12.0 // indirect
121+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
122+
github.com/sashamelentyev/usestdlibvars v1.13.0 // indirect
123+
github.com/securego/gosec/v2 v2.13.1 // indirect
122124
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
123125
github.com/sirupsen/logrus v1.9.0 // indirect
124126
github.com/sivchari/containedctx v1.0.2 // indirect
@@ -137,10 +139,11 @@ require (
137139
github.com/stretchr/objx v0.4.0 // indirect
138140
github.com/stretchr/testify v1.8.0 // indirect
139141
github.com/subosito/gotenv v1.4.0 // indirect
140-
github.com/sylvia7788/contextcheck v1.0.4 // indirect
142+
github.com/sylvia7788/contextcheck v1.0.6 // indirect
141143
github.com/tdakkota/asciicheck v0.1.1 // indirect
142144
github.com/tetafro/godot v1.4.11 // indirect
143145
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
146+
github.com/timonwong/logrlint v0.1.0 // indirect
144147
github.com/tomarrell/wrapcheck/v2 v2.6.2 // indirect
145148
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
146149
github.com/ultraware/funlen v0.0.3 // indirect
@@ -152,10 +155,11 @@ require (
152155
go.uber.org/atomic v1.7.0 // indirect
153156
go.uber.org/multierr v1.6.0 // indirect
154157
go.uber.org/zap v1.17.0 // indirect
158+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
155159
golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
156160
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
157161
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
158-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
162+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
159163
golang.org/x/text v0.3.7 // indirect
160164
golang.org/x/tools v0.1.12 // indirect
161165
google.golang.org/protobuf v1.28.0 // indirect

0 commit comments

Comments
 (0)