Skip to content

Commit 3a7003f

Browse files
PrateeknandlePrateeknandle
authored
Merge pull request #1938 from rksharma95/upgrade-go-dependencies
chore(dependency): upgrade go dependencies and bump go version to 1.23.0
2 parents a5791b5 + 72c6b51 commit 3a7003f

File tree

16 files changed

+850
-1071
lines changed

16 files changed

+850
-1071
lines changed

‎Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33

44
### Builder
55

6-
FROM golang:1.22-alpine3.20 AS builder
6+
FROM golang:1.23-alpine3.20 AS builder
77

88
RUN apk --no-cache update
9-
RUN apk add --no-cache git clang llvm make gcc protobuf
9+
RUN apk add --no-cache git clang llvm make gcc protobuf protobuf-dev curl
1010

1111
WORKDIR /usr/src/KubeArmor
1212

1313
COPY . .
1414

1515
WORKDIR /usr/src/KubeArmor/KubeArmor
1616

17-
RUN go install github.com/golang/protobuf/protoc-gen-go@latest
17+
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
1818
RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
19-
RUN make
2019

20+
RUN make
2121

2222
WORKDIR /usr/src/KubeArmor/BPF
2323

24-
RUN apk add curl
2524
# install bpftool
2625
RUN arch=$(uname -m) bpftool_version=v7.3.0 && \
2726
if [[ "$arch" == "aarch64" ]]; then \

‎KubeArmor/go.mod

+69-68
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/kubearmor/KubeArmor/KubeArmor
22

3-
go 1.22.0
4-
5-
toolchain go1.22.9
3+
go 1.23.4
64

75
replace (
86
github.com/kubearmor/KubeArmor => ../../
@@ -21,83 +19,86 @@ replace (
2119
github.com/kubearmor/KubeArmor/deployments => ../deployments
2220
github.com/kubearmor/KubeArmor/pkg/KubeArmorController => ../pkg/KubeArmorController
2321
github.com/kubearmor/KubeArmor/protobuf => ../protobuf
22+
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
23+
2424
)
2525

2626
require (
27-
github.com/Masterminds/sprig/v3 v3.2.3
28-
github.com/cilium/cilium v1.14.12
29-
github.com/cilium/ebpf v0.12.3
27+
github.com/Masterminds/sprig/v3 v3.3.0
28+
github.com/cilium/cilium v1.16.5
29+
github.com/cilium/ebpf v0.17.1
3030
github.com/containerd/containerd/api v1.8.0
31-
github.com/containerd/containerd/v2 v2.0.0
32-
github.com/containerd/nri v0.8.0
33-
github.com/containerd/typeurl/v2 v2.2.2
34-
github.com/docker/docker v27.1.1+incompatible
35-
github.com/fsnotify/fsnotify v1.7.0
31+
github.com/containerd/containerd/v2 v2.0.2
32+
github.com/containerd/nri v0.9.0
33+
github.com/containerd/typeurl/v2 v2.2.3
34+
github.com/docker/docker v27.5.0+incompatible
35+
github.com/fsnotify/fsnotify v1.8.0
3636
github.com/golang/protobuf v1.5.4
3737
github.com/google/uuid v1.6.0
38-
github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20240110164432-c2c1b121cd94
39-
github.com/kubearmor/KubeArmor/protobuf v0.0.0-20240110164432-c2c1b121cd94
38+
github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20250117172841-503b97db4876
39+
github.com/kubearmor/KubeArmor/protobuf v0.0.0-20250117172841-503b97db4876
4040
github.com/opencontainers/runtime-spec v1.2.0
41-
github.com/spf13/viper v1.18.2
42-
go.uber.org/zap v1.26.0
43-
golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e
44-
golang.org/x/sys v0.26.0
45-
google.golang.org/grpc v1.67.1
46-
google.golang.org/protobuf v1.35.1
47-
k8s.io/api v0.31.2
48-
k8s.io/apimachinery v0.31.2
49-
k8s.io/client-go v0.31.2
50-
k8s.io/cri-api v0.31.2
41+
github.com/spf13/viper v1.19.0
42+
go.uber.org/zap v1.27.0
43+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
44+
golang.org/x/sys v0.29.0
45+
google.golang.org/grpc v1.69.4
46+
google.golang.org/protobuf v1.36.3
47+
k8s.io/api v0.32.1
48+
k8s.io/apimachinery v0.32.1
49+
k8s.io/client-go v0.32.1
50+
k8s.io/cri-api v0.32.1
5151
k8s.io/klog/v2 v2.130.1
52-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
53-
sigs.k8s.io/controller-runtime v0.19.4
52+
k8s.io/utils v0.0.0-20241210054802-24370beab758
53+
sigs.k8s.io/controller-runtime v0.20.0
5454
)
5555

5656
require (
57+
dario.cat/mergo v1.0.1 // indirect
5758
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
5859
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
5960
github.com/Masterminds/goutils v1.1.1 // indirect
60-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
61+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
6162
github.com/Microsoft/go-winio v0.6.2 // indirect
6263
github.com/Microsoft/hcsshim v0.12.9 // indirect
6364
github.com/beorn7/perks v1.0.1 // indirect
6465
github.com/cespare/xxhash/v2 v2.3.0 // indirect
65-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
66-
github.com/containerd/continuity v0.4.4 // indirect
66+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
67+
github.com/containerd/continuity v0.4.5 // indirect
6768
github.com/containerd/errdefs v1.0.0 // indirect
6869
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6970
github.com/containerd/fifo v1.1.0 // indirect
7071
github.com/containerd/log v0.1.0 // indirect
71-
github.com/containerd/platforms v1.0.0-rc.0 // indirect
72+
github.com/containerd/platforms v1.0.0-rc.1 // indirect
7273
github.com/containerd/plugin v1.0.0 // indirect
73-
github.com/containerd/ttrpc v1.2.6 // indirect
74+
github.com/containerd/ttrpc v1.2.7 // indirect
7475
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7576
github.com/distribution/reference v0.6.0 // indirect
7677
github.com/docker/go-connections v0.5.0 // indirect
7778
github.com/docker/go-units v0.5.0 // indirect
78-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
79+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
7980
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
8081
github.com/felixge/httpsnoop v1.0.4 // indirect
8182
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8283
github.com/go-logr/logr v1.4.2 // indirect
8384
github.com/go-logr/stdr v1.2.2 // indirect
84-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
85-
github.com/go-openapi/jsonreference v0.20.4 // indirect
86-
github.com/go-openapi/swag v0.22.7 // indirect
85+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
86+
github.com/go-openapi/jsonreference v0.21.0 // indirect
87+
github.com/go-openapi/swag v0.23.0 // indirect
8788
github.com/gogo/protobuf v1.3.2 // indirect
88-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
89-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
89+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
90+
github.com/google/btree v1.1.3 // indirect
91+
github.com/google/gnostic-models v0.6.9 // indirect
9092
github.com/google/go-cmp v0.6.0 // indirect
9193
github.com/google/gofuzz v1.2.0 // indirect
92-
github.com/hashicorp/errwrap v1.1.0 // indirect
93-
github.com/hashicorp/hcl v1.0.0 // indirect
94-
github.com/huandu/xstrings v1.4.0 // indirect
95-
github.com/imdario/mergo v0.3.16 // indirect
94+
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
95+
github.com/huandu/xstrings v1.5.0 // indirect
9696
github.com/josharian/intern v1.0.0 // indirect
9797
github.com/json-iterator/go v1.1.12 // indirect
9898
github.com/klauspost/compress v1.17.11 // indirect
99-
github.com/magiconair/properties v1.8.7 // indirect
100-
github.com/mailru/easyjson v0.7.7 // indirect
99+
github.com/knqyf263/go-plugin v0.8.1-0.20240827022226-114c6257e441 // indirect
100+
github.com/magiconair/properties v1.8.9 // indirect
101+
github.com/mailru/easyjson v0.9.0 // indirect
101102
github.com/mitchellh/copystructure v1.2.0 // indirect
102103
github.com/mitchellh/mapstructure v1.5.0 // indirect
103104
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -108,7 +109,6 @@ require (
108109
github.com/moby/sys/signal v0.7.1 // indirect
109110
github.com/moby/sys/user v0.3.0 // indirect
110111
github.com/moby/sys/userns v0.1.0 // indirect
111-
github.com/moby/term v0.5.0 // indirect
112112
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113113
github.com/modern-go/reflect2 v1.0.2 // indirect
114114
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -120,44 +120,45 @@ require (
120120
github.com/pkg/errors v0.9.1 // indirect
121121
github.com/prometheus/client_golang v1.20.5 // indirect
122122
github.com/prometheus/client_model v0.6.1 // indirect
123-
github.com/prometheus/common v0.55.0 // indirect
123+
github.com/prometheus/common v0.62.0 // indirect
124124
github.com/prometheus/procfs v0.15.1 // indirect
125-
github.com/sagikazarmark/locafero v0.4.0 // indirect
125+
github.com/sagikazarmark/locafero v0.7.0 // indirect
126126
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
127-
github.com/shopspring/decimal v1.3.1 // indirect
127+
github.com/shopspring/decimal v1.4.0 // indirect
128128
github.com/sirupsen/logrus v1.9.3 // indirect
129129
github.com/sourcegraph/conc v0.3.0 // indirect
130-
github.com/spf13/afero v1.11.0 // indirect
131-
github.com/spf13/cast v1.6.0 // indirect
132-
github.com/spf13/pflag v1.0.5 // indirect
130+
github.com/spf13/afero v1.12.0 // indirect
131+
github.com/spf13/cast v1.7.1 // indirect
132+
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
133133
github.com/subosito/gotenv v1.6.0 // indirect
134134
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
135+
github.com/tetratelabs/wazero v1.8.2 // indirect
135136
github.com/x448/float16 v0.8.4 // indirect
136137
go.opencensus.io v0.24.0 // indirect
137-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
138-
go.opentelemetry.io/otel v1.31.0 // indirect
139-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
140-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
138+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
139+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
140+
go.opentelemetry.io/otel v1.34.0 // indirect
141+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
142+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
141143
go.uber.org/multierr v1.11.0 // indirect
142-
golang.org/x/crypto v0.28.0 // indirect
143-
golang.org/x/mod v0.21.0 // indirect
144-
golang.org/x/net v0.30.0 // indirect
145-
golang.org/x/oauth2 v0.22.0 // indirect
146-
golang.org/x/sync v0.8.0 // indirect
147-
golang.org/x/term v0.25.0 // indirect
148-
golang.org/x/text v0.19.0 // indirect
149-
golang.org/x/time v0.5.0 // indirect
144+
golang.org/x/crypto v0.32.0 // indirect
145+
golang.org/x/mod v0.22.0 // indirect
146+
golang.org/x/net v0.34.0 // indirect
147+
golang.org/x/oauth2 v0.25.0 // indirect
148+
golang.org/x/sync v0.10.0 // indirect
149+
golang.org/x/term v0.28.0 // indirect
150+
golang.org/x/text v0.21.0 // indirect
151+
golang.org/x/time v0.9.0 // indirect
150152
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
151-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
153+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
154+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
152155
gopkg.in/inf.v0 v0.9.1 // indirect
153156
gopkg.in/ini.v1 v1.67.0 // indirect
154-
gopkg.in/yaml.v2 v2.4.0 // indirect
155157
gopkg.in/yaml.v3 v3.0.1 // indirect
156-
gotest.tools/v3 v3.4.0 // indirect
157-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
158-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
159-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
160-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
158+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
159+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
160+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
161+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
161162
sigs.k8s.io/yaml v1.4.0 // indirect
162163
tags.cncf.io/container-device-interface v0.8.0 // indirect
163164
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect

0 commit comments

Comments
 (0)