Skip to content

Commit b6997f5

Browse files
authored
chore: update k8s deps to v1.24 (#164)
Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
1 parent 8b88a5b commit b6997f5

File tree

7 files changed

+92
-80
lines changed

7 files changed

+92
-80
lines changed

.pipelines/templates/scan-images-template.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ steps:
55
export OUTPUT_TYPE="type=docker"
66
make docker-init-buildx docker-build
77
8-
wget https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION:-0.24.4}/trivy_${TRIVY_VERSION:-0.24.4}_Linux-64bit.tar.gz
9-
tar zxvf trivy_${TRIVY_VERSION:-0.24.4}_Linux-64bit.tar.gz
8+
wget https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION:-0.30.2}/trivy_${TRIVY_VERSION:-0.30.2}_Linux-64bit.tar.gz
9+
tar zxvf trivy_${TRIVY_VERSION:-0.30.2}_Linux-64bit.tar.gz
1010
1111
# show all vulnerabilities in the logs
1212
./trivy image "${REGISTRY}/keyvault:${IMAGE_VERSION}"

cmd/server/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func main() {
5757

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

go.mod

+17-17
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ require (
99
go.opentelemetry.io/otel v0.20.0
1010
go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0
1111
go.opentelemetry.io/otel/metric v0.20.0
12-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
13-
golang.org/x/net v0.0.0-20211209124913-491a49abca63
14-
google.golang.org/grpc v1.40.1
15-
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/apiserver v0.23.9
17-
k8s.io/component-base v0.23.9
18-
k8s.io/klog/v2 v2.30.0
12+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
13+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
14+
google.golang.org/grpc v1.48.0
15+
gopkg.in/yaml.v3 v3.0.1
16+
k8s.io/apiserver v0.24.3
17+
k8s.io/component-base v0.24.3
18+
k8s.io/klog/v2 v2.70.1
1919
)
2020

2121
require (
@@ -26,22 +26,21 @@ require (
2626
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2727
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2828
github.com/beorn7/perks v1.0.1 // indirect
29-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3030
github.com/go-logr/logr v1.2.0 // indirect
3131
github.com/go-logr/zapr v1.2.0 // 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
35-
github.com/google/go-cmp v0.5.5 // indirect
3635
github.com/google/gofuzz v1.1.0 // indirect
3736
github.com/json-iterator/go v1.1.12 // indirect
3837
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
3938
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4039
github.com/modern-go/reflect2 v1.0.2 // indirect
41-
github.com/prometheus/client_golang v1.11.0 // indirect
40+
github.com/prometheus/client_golang v1.12.1 // indirect
4241
github.com/prometheus/client_model v0.2.0 // indirect
43-
github.com/prometheus/common v0.28.0 // indirect
44-
github.com/prometheus/procfs v0.6.0 // indirect
42+
github.com/prometheus/common v0.32.1 // indirect
43+
github.com/prometheus/procfs v0.7.3 // indirect
4544
github.com/spf13/pflag v1.0.5 // indirect
4645
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
4746
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
@@ -50,13 +49,14 @@ require (
5049
go.uber.org/atomic v1.7.0 // indirect
5150
go.uber.org/multierr v1.6.0 // indirect
5251
go.uber.org/zap v1.19.0 // indirect
53-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
52+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
5453
golang.org/x/text v0.3.7 // indirect
55-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
54+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
5655
google.golang.org/protobuf v1.27.1 // indirect
5756
gopkg.in/inf.v0 v0.9.1 // indirect
58-
k8s.io/apimachinery v0.23.9 // indirect
59-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
60-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
57+
gopkg.in/yaml.v2 v2.4.0 // indirect
58+
k8s.io/apimachinery v0.24.3 // indirect
59+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
60+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
6161
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
6262
)

0 commit comments

Comments
 (0)