Skip to content

Commit 39e3f33

Browse files
authored
Merge pull request #163 from slok/slok/update-deps
2 parents eac8265 + 2d93708 commit 39e3f33

File tree

5 files changed

+80
-64
lines changed

5 files changed

+80
-64
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v3
2525
- uses: actions/setup-go@v2
2626
with:
27-
go-version: 1.17
27+
go-version: 1.18
2828
- run: make ci-unit-test
2929

3030
integration-test:
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@v3
4040
- uses: actions/setup-go@v2
4141
with:
42-
go-version: 1.17
42+
go-version: 1.18
4343
- name: Execute tests
4444
env:
4545
KIND_VERSION: v0.11.1

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
- Update to Kubernetes v1.23.
66
- Fix panics on missing requestKind and RequestResource on v1beta1.
77
- Fix panics on missing requestKind and RequestResource on v1.
8+
- Update to Go v1.18.
9+
10+
### Fixed
11+
12+
- [Unauthenticated control plane denial of service attack.](https://github.com/istio/istio/security/advisories/GHSA-856q-xv3c-7f2f)
13+
814

915
## [2.2.0] - 2021-12-05
1016

docker/dev/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17
1+
FROM golang:1.18
22

33
ARG GOLANGCI_LINT_VERSION="1.43.0"
44
ARG MOCKERY_VERSION="2.8.0"

go.mod

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
module github.com/slok/kubewebhook/v2
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/prometheus/client_golang v1.11.0
6+
github.com/prometheus/client_golang v1.12.1
77
github.com/sirupsen/logrus v1.8.1
8-
github.com/stretchr/testify v1.7.0
9-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0
10-
go.opentelemetry.io/otel v1.3.0
11-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.3.0
12-
go.opentelemetry.io/otel/sdk v1.3.0
13-
go.opentelemetry.io/otel/trace v1.3.0
8+
github.com/stretchr/testify v1.7.1
9+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.30.0
10+
go.opentelemetry.io/otel v1.5.0
11+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.5.0
12+
go.opentelemetry.io/otel/sdk v1.5.0
13+
go.opentelemetry.io/otel/trace v1.5.0
1414
gomodules.xyz/jsonpatch/v3 v3.0.1
15-
k8s.io/api v0.23.0
16-
k8s.io/apimachinery v0.23.0
17-
k8s.io/client-go v0.23.0
15+
k8s.io/api v0.23.5
16+
k8s.io/apimachinery v0.23.5
17+
k8s.io/client-go v0.23.5
1818
)
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
22+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2525
github.com/felixge/httpsnoop v1.0.2 // indirect
26-
github.com/go-logr/logr v1.2.1 // indirect
27-
github.com/go-logr/stdr v1.2.0 // indirect
26+
github.com/go-logr/logr v1.2.2 // indirect
27+
github.com/go-logr/stdr v1.2.2 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
2929
github.com/golang/protobuf v1.5.2 // indirect
30-
github.com/google/go-cmp v0.5.6 // indirect
30+
github.com/google/go-cmp v0.5.7 // indirect
3131
github.com/google/gofuzz v1.1.0 // indirect
3232
github.com/googleapis/gnostic v0.5.5 // indirect
3333
github.com/imdario/mergo v0.3.5 // indirect
@@ -38,15 +38,15 @@ require (
3838
github.com/pkg/errors v0.9.1 // indirect
3939
github.com/pmezard/go-difflib v1.0.0 // indirect
4040
github.com/prometheus/client_model v0.2.0 // indirect
41-
github.com/prometheus/common v0.26.0 // indirect
42-
github.com/prometheus/procfs v0.6.0 // indirect
41+
github.com/prometheus/common v0.32.1 // indirect
42+
github.com/prometheus/procfs v0.7.3 // indirect
4343
github.com/spf13/pflag v1.0.5 // indirect
4444
github.com/stretchr/objx v0.1.1 // indirect
45-
go.opentelemetry.io/otel/internal/metric v0.26.0 // indirect
46-
go.opentelemetry.io/otel/metric v0.26.0 // indirect
47-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
45+
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
46+
go.opentelemetry.io/otel/metric v0.27.0 // indirect
47+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
4848
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
49-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
49+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
5050
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
5151
golang.org/x/text v0.3.7 // indirect
5252
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
@@ -58,8 +58,8 @@ require (
5858
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
5959
k8s.io/klog/v2 v2.30.0 // indirect
6060
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
61-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
61+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
6262
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
63-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
63+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
6464
sigs.k8s.io/yaml v1.2.0 // indirect
6565
)

0 commit comments

Comments
 (0)