Skip to content

Commit b6fa41a

Browse files
Merge pull request #2028 from Aryan-sharma11/dep
chore: Upgrade dependencies
2 parents 3c18ec1 + d05a68b commit b6fa41a

File tree

19 files changed

+517
-582
lines changed

19 files changed

+517
-582
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
### Builder
55

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

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

KubeArmor/core/dockerHandler.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"strings"
1515
"time"
1616

17-
"github.com/docker/docker/api/types"
1817
"github.com/docker/docker/api/types/container"
1918
"github.com/docker/docker/api/types/events"
2019
"github.com/docker/docker/client"
@@ -218,7 +217,7 @@ func (dh *DockerHandler) GetContainerInfo(containerID string, OwnerInfo map[stri
218217
// GetEventChannel Function
219218
func (dh *DockerHandler) GetEventChannel() <-chan events.Message {
220219
if dh.DockerClient != nil {
221-
event, _ := dh.DockerClient.Events(context.Background(), types.EventsOptions{})
220+
event, _ := dh.DockerClient.Events(context.Background(), events.ListOptions{})
222221
return event
223222
}
224223

KubeArmor/core/karmorprobedata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"context"
88
"encoding/json"
99

10-
"github.com/golang/protobuf/ptypes/empty"
1110
kl "github.com/kubearmor/KubeArmor/KubeArmor/common"
1211
cfg "github.com/kubearmor/KubeArmor/KubeArmor/config"
1312
tp "github.com/kubearmor/KubeArmor/KubeArmor/types"
1413
pb "github.com/kubearmor/KubeArmor/protobuf"
14+
"google.golang.org/protobuf/types/known/emptypb"
1515
)
1616

1717
// KarmorData Structure
@@ -141,7 +141,7 @@ func (dm *KubeArmorDaemon) SetProbeContainerData() ([]string, map[string]*pb.Con
141141
}
142142

143143
// GetProbeData sends policy data through grpc client
144-
func (p *Probe) GetProbeData(c context.Context, in *empty.Empty) (*pb.ProbeResponse, error) {
144+
func (p *Probe) GetProbeData(c context.Context, in *emptypb.Empty) (*pb.ProbeResponse, error) {
145145
containerList, containerMap, hostMap := p.GetContainerData()
146146
res := &pb.ProbeResponse{
147147
ContainerList: containerList,

KubeArmor/core/unorchestratedUpdates.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ package core
55

66
import (
77
"encoding/json"
8-
"github.com/fsnotify/fsnotify"
9-
"github.com/spf13/viper"
108
"os"
119
"regexp"
1210
"sort"
1311
"strings"
1412

13+
"github.com/fsnotify/fsnotify"
14+
"github.com/spf13/viper"
15+
1516
kl "github.com/kubearmor/KubeArmor/KubeArmor/common"
1617
cfg "github.com/kubearmor/KubeArmor/KubeArmor/config"
1718
kg "github.com/kubearmor/KubeArmor/KubeArmor/log"
@@ -772,7 +773,7 @@ func (dm *KubeArmorDaemon) backupKubeArmorHostPolicy(policy tp.HostSecurityPolic
772773
if policyBytes, err := json.Marshal(policy); err == nil {
773774
if _, err = file.Write(policyBytes); err == nil {
774775
if err := file.Close(); err != nil {
775-
dm.Logger.Errf(err.Error())
776+
dm.Logger.Err(err.Error())
776777
}
777778
}
778779
}
@@ -796,7 +797,7 @@ func (dm *KubeArmorDaemon) backupKubeArmorContainerPolicy(policy tp.SecurityPoli
796797
if policyBytes, err := json.Marshal(policy); err == nil {
797798
if _, err = file.Write(policyBytes); err == nil {
798799
if err := file.Close(); err != nil {
799-
dm.Logger.Errf(err.Error())
800+
dm.Logger.Err(err.Error())
800801
}
801802
}
802803
}

KubeArmor/go.mod

Lines changed: 58 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubearmor/KubeArmor/KubeArmor
22

3-
go 1.23.6
3+
go 1.24.2
44

55
replace (
66
github.com/kubearmor/KubeArmor => ../../
@@ -25,32 +25,31 @@ replace (
2525

2626
require (
2727
github.com/Masterminds/sprig/v3 v3.3.0
28-
github.com/cilium/cilium v1.16.6
29-
github.com/cilium/ebpf v0.17.1
28+
github.com/cilium/cilium v1.17.2
29+
github.com/cilium/ebpf v0.18.0
3030
github.com/containerd/containerd/api v1.8.0
31-
github.com/containerd/containerd/v2 v2.0.2
31+
github.com/containerd/containerd/v2 v2.0.4
3232
github.com/containerd/nri v0.9.0
3333
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
36-
github.com/golang/protobuf v1.5.4
34+
github.com/docker/docker v28.0.4+incompatible
35+
github.com/fsnotify/fsnotify v1.9.0
3736
github.com/google/uuid v1.6.0
38-
github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20250117172841-503b97db4876
39-
github.com/kubearmor/KubeArmor/protobuf v0.0.0-20250117172841-503b97db4876
40-
github.com/opencontainers/runtime-spec v1.2.0
41-
github.com/spf13/viper v1.19.0
37+
github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20250328055045-3c18ec1c3403
38+
github.com/kubearmor/KubeArmor/protobuf v0.0.0-20250328055045-3c18ec1c3403
39+
github.com/opencontainers/runtime-spec v1.2.1
40+
github.com/spf13/viper v1.20.1
4241
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
42+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
43+
golang.org/x/sys v0.32.0
44+
google.golang.org/grpc v1.71.1
45+
google.golang.org/protobuf v1.36.6
46+
k8s.io/api v0.32.3
47+
k8s.io/apimachinery v0.32.3
48+
k8s.io/client-go v0.32.3
49+
k8s.io/cri-api v0.32.3
5150
k8s.io/klog/v2 v2.130.1
52-
k8s.io/utils v0.0.0-20241210054802-24370beab758
53-
sigs.k8s.io/controller-runtime v0.20.0
51+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
52+
sigs.k8s.io/controller-runtime v0.20.4
5453
)
5554

5655
require (
@@ -76,90 +75,83 @@ require (
7675
github.com/distribution/reference v0.6.0 // indirect
7776
github.com/docker/go-connections v0.5.0 // indirect
7877
github.com/docker/go-units v0.5.0 // indirect
79-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
80-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
78+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
79+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8180
github.com/felixge/httpsnoop v1.0.4 // indirect
82-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
81+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
8382
github.com/go-logr/logr v1.4.2 // indirect
8483
github.com/go-logr/stdr v1.2.2 // indirect
85-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
84+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
8685
github.com/go-openapi/jsonreference v0.21.0 // indirect
87-
github.com/go-openapi/swag v0.23.0 // indirect
86+
github.com/go-openapi/swag v0.23.1 // indirect
87+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
8888
github.com/gogo/protobuf v1.3.2 // indirect
8989
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
90+
github.com/golang/protobuf v1.5.4 // indirect
9091
github.com/google/btree v1.1.3 // indirect
9192
github.com/google/gnostic-models v0.6.9 // indirect
92-
github.com/google/go-cmp v0.6.0 // indirect
93+
github.com/google/go-cmp v0.7.0 // indirect
9394
github.com/google/gofuzz v1.2.0 // indirect
94-
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
9595
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
98-
github.com/klauspost/compress v1.17.11 // indirect
99-
github.com/knqyf263/go-plugin v0.8.1-0.20240827022226-114c6257e441 // indirect
100-
github.com/magiconair/properties v1.8.9 // indirect
98+
github.com/klauspost/compress v1.18.0 // indirect
99+
github.com/knqyf263/go-plugin v0.9.0 // indirect
101100
github.com/mailru/easyjson v0.9.0 // indirect
102101
github.com/mitchellh/copystructure v1.2.0 // indirect
103-
github.com/mitchellh/mapstructure v1.5.0 // indirect
104102
github.com/mitchellh/reflectwalk v1.0.2 // indirect
105103
github.com/moby/docker-image-spec v1.3.1 // indirect
106104
github.com/moby/locker v1.0.1 // indirect
107105
github.com/moby/sys/mountinfo v0.7.2 // indirect
108106
github.com/moby/sys/sequential v0.6.0 // indirect
109107
github.com/moby/sys/signal v0.7.1 // indirect
110-
github.com/moby/sys/user v0.3.0 // indirect
108+
github.com/moby/sys/user v0.4.0 // indirect
111109
github.com/moby/sys/userns v0.1.0 // indirect
112110
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113111
github.com/modern-go/reflect2 v1.0.2 // indirect
114112
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
115113
github.com/opencontainers/go-digest v1.0.0 // indirect
116-
github.com/opencontainers/image-spec v1.1.0 // indirect
117-
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
118-
github.com/opencontainers/selinux v1.11.1 // indirect
119-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
114+
github.com/opencontainers/image-spec v1.1.1 // indirect
115+
github.com/opencontainers/selinux v1.12.0 // indirect
116+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
120117
github.com/pkg/errors v0.9.1 // indirect
121-
github.com/prometheus/client_golang v1.20.5 // indirect
118+
github.com/prometheus/client_golang v1.22.0 // indirect
122119
github.com/prometheus/client_model v0.6.1 // indirect
123-
github.com/prometheus/common v0.62.0 // indirect
124-
github.com/prometheus/procfs v0.15.1 // indirect
125-
github.com/sagikazarmark/locafero v0.7.0 // indirect
126-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
120+
github.com/prometheus/common v0.63.0 // indirect
121+
github.com/prometheus/procfs v0.16.0 // indirect
122+
github.com/sagikazarmark/locafero v0.9.0 // indirect
127123
github.com/shopspring/decimal v1.4.0 // indirect
128124
github.com/sirupsen/logrus v1.9.3 // indirect
129125
github.com/sourcegraph/conc v0.3.0 // indirect
130-
github.com/spf13/afero v1.12.0 // indirect
126+
github.com/spf13/afero v1.14.0 // indirect
131127
github.com/spf13/cast v1.7.1 // indirect
132-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
128+
github.com/spf13/pflag v1.0.6 // indirect
133129
github.com/subosito/gotenv v1.6.0 // indirect
134-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
135-
github.com/tetratelabs/wazero v1.8.2 // indirect
130+
github.com/tetratelabs/wazero v1.9.0 // indirect
136131
github.com/x448/float16 v0.8.4 // indirect
137132
go.opencensus.io v0.24.0 // indirect
138133
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
134+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
135+
go.opentelemetry.io/otel v1.35.0 // indirect
136+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
137+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
143138
go.uber.org/multierr v1.11.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
152-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
153-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
139+
golang.org/x/crypto v0.37.0 // indirect
140+
golang.org/x/net v0.39.0 // indirect
141+
golang.org/x/oauth2 v0.29.0 // indirect
142+
golang.org/x/sync v0.13.0 // indirect
143+
golang.org/x/term v0.31.0 // indirect
144+
golang.org/x/text v0.24.0 // indirect
145+
golang.org/x/time v0.11.0 // indirect
146+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
147+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250409194420-de1ac958c67a // indirect
154148
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
155149
gopkg.in/inf.v0 v0.9.1 // indirect
156-
gopkg.in/ini.v1 v1.67.0 // indirect
157150
gopkg.in/yaml.v3 v3.0.1 // indirect
158-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
159-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
151+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
152+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
160153
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
161-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
154+
sigs.k8s.io/randfill v1.0.0 // indirect
155+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
162156
sigs.k8s.io/yaml v1.4.0 // indirect
163-
tags.cncf.io/container-device-interface v0.8.0 // indirect
164-
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
165157
)

0 commit comments

Comments
 (0)