Skip to content

Commit 158dd99

Browse files
rksharma95rksharma95
authored
Merge pull request #70 from rksharma95/upgrade-deps
upgrade dependencies and go version
2 parents f5cfa54 + 83f152d commit 158dd99

File tree

3 files changed

+136
-41
lines changed

3 files changed

+136
-41
lines changed

‎relay-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### Builder
22

3-
FROM golang:1.22-alpine3.19 as builder
3+
FROM golang:1.24-alpine3.20 as builder
44

55
RUN apk update
66
RUN apk add --no-cache make

‎relay-server/go.mod

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubearmor/kubearmor-relay-server/relay-server
22

3-
go 1.22
3+
go 1.24.3
44

55
replace (
66
github.com/kubearmor/kubearmor-relay-server/relay-server => ./
@@ -10,73 +10,79 @@ replace (
1010
)
1111

1212
require (
13-
github.com/cenkalti/backoff/v4 v4.2.1
13+
github.com/cenkalti/backoff/v4 v4.3.0
1414
github.com/dustin/go-humanize v1.0.1
1515
github.com/elastic/go-elasticsearch/v7 v7.17.10
1616
github.com/google/uuid v1.6.0
17-
github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20240412061210-e4422dd02342
18-
github.com/kubearmor/KubeArmor/protobuf v0.0.0-20240315075053-fee50c9428b9
19-
github.com/spf13/viper v1.18.2
17+
github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20250528063856-6977b51008ef
18+
github.com/kubearmor/KubeArmor/protobuf v0.0.0-20250528063856-6977b51008ef
19+
github.com/spf13/viper v1.20.1
2020
go.uber.org/zap v1.27.0
21-
golang.org/x/sync v0.7.0
22-
google.golang.org/grpc v1.63.2
23-
k8s.io/api v0.29.2
24-
k8s.io/apimachinery v0.29.2
25-
k8s.io/client-go v0.29.2
21+
golang.org/x/sync v0.14.0
22+
google.golang.org/grpc v1.72.2
23+
k8s.io/api v0.33.1
24+
k8s.io/apimachinery v0.33.1
25+
k8s.io/client-go v0.33.1
2626
)
2727

2828
require (
2929
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
30-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
31-
github.com/fsnotify/fsnotify v1.7.0 // indirect
32-
github.com/go-logr/logr v1.4.1 // indirect
33-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
30+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
31+
github.com/fsnotify/fsnotify v1.9.0 // indirect
32+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
33+
github.com/go-logr/logr v1.4.2 // indirect
34+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3435
github.com/go-openapi/jsonreference v0.21.0 // indirect
35-
github.com/go-openapi/swag v0.23.0 // indirect
36+
github.com/go-openapi/swag v0.23.1 // indirect
37+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
3638
github.com/gogo/protobuf v1.3.2 // indirect
3739
github.com/golang/protobuf v1.5.4 // indirect
38-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
39-
github.com/google/go-cmp v0.6.0 // indirect
40+
github.com/google/gnostic-models v0.6.9 // indirect
41+
github.com/google/go-cmp v0.7.0 // indirect
4042
github.com/google/gofuzz v1.2.0 // indirect
41-
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
43+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
4244
github.com/hashicorp/hcl v1.0.0 // indirect
4345
github.com/imdario/mergo v0.3.16 // indirect
4446
github.com/josharian/intern v1.0.0 // indirect
4547
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/magiconair/properties v1.8.7 // indirect
47-
github.com/mailru/easyjson v0.7.7 // indirect
48+
github.com/magiconair/properties v1.8.10 // indirect
49+
github.com/mailru/easyjson v0.9.0 // indirect
4850
github.com/mitchellh/mapstructure v1.5.0 // indirect
4951
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5052
github.com/modern-go/reflect2 v1.0.2 // indirect
5153
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
52-
github.com/onsi/gomega v1.30.0 // indirect
53-
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
54-
github.com/sagikazarmark/locafero v0.4.0 // indirect
54+
github.com/onsi/gomega v1.35.1 // indirect
55+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
56+
github.com/pkg/errors v0.9.1 // indirect
57+
github.com/sagikazarmark/locafero v0.9.0 // indirect
5558
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
5659
github.com/sourcegraph/conc v0.3.0 // indirect
57-
github.com/spf13/afero v1.11.0 // indirect
58-
github.com/spf13/cast v1.6.0 // indirect
59-
github.com/spf13/pflag v1.0.5 // indirect
60+
github.com/spf13/afero v1.14.0 // indirect
61+
github.com/spf13/cast v1.8.0 // indirect
62+
github.com/spf13/pflag v1.0.6 // indirect
6063
github.com/subosito/gotenv v1.6.0 // indirect
64+
github.com/x448/float16 v0.8.4 // indirect
6165
go.uber.org/multierr v1.11.0 // indirect
62-
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
63-
golang.org/x/net v0.24.0 // indirect
64-
golang.org/x/oauth2 v0.18.0 // indirect
65-
golang.org/x/sys v0.19.0 // indirect
66-
golang.org/x/term v0.19.0 // indirect
67-
golang.org/x/text v0.14.0 // indirect
68-
golang.org/x/time v0.5.0 // indirect
66+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
67+
golang.org/x/net v0.40.0 // indirect
68+
golang.org/x/oauth2 v0.30.0 // indirect
69+
golang.org/x/sys v0.33.0 // indirect
70+
golang.org/x/term v0.32.0 // indirect
71+
golang.org/x/text v0.25.0 // indirect
72+
golang.org/x/time v0.11.0 // indirect
6973
google.golang.org/appengine v1.6.8 // indirect
70-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
71-
google.golang.org/protobuf v1.33.0 // indirect
74+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
75+
google.golang.org/protobuf v1.36.6 // indirect
76+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7277
gopkg.in/inf.v0 v0.9.1 // indirect
7378
gopkg.in/ini.v1 v1.67.0 // indirect
7479
gopkg.in/yaml.v2 v2.4.0 // indirect
7580
gopkg.in/yaml.v3 v3.0.1 // indirect
76-
k8s.io/klog/v2 v2.120.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
78-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
79-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
80-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
81+
k8s.io/klog/v2 v2.130.1 // indirect
82+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
83+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
84+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
85+
sigs.k8s.io/randfill v1.0.0 // indirect
86+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
8187
sigs.k8s.io/yaml v1.4.0 // indirect
8288
)

0 commit comments

Comments
 (0)