Skip to content

Commit 31815b7

Browse files
matthyxmatthyx
authored
Merge pull request #288 from kubescape/statefulset
bump k8s-interface to fix GenerateInstanceID for statefulsets
2 parents 6326059 + 17cfd16 commit 31815b7

File tree

2 files changed

+193
-193
lines changed

2 files changed

+193
-193
lines changed

‎go.mod

+59-60
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
module github.com/kubescape/operator
22

3-
go 1.23.0
3+
go 1.23.2
44

5-
toolchain go1.23.2
5+
toolchain go1.23.5
66

77
require (
8-
github.com/armosec/armoapi-go v0.0.501
8+
github.com/armosec/armoapi-go v0.0.512
99
github.com/armosec/registryx v0.0.24
1010
github.com/armosec/utils-go v0.0.58
1111
github.com/armosec/utils-k8s-go v0.0.30
1212
github.com/cenkalti/backoff v2.2.1+incompatible
1313
github.com/cenkalti/backoff/v4 v4.3.0
1414
github.com/deckarep/golang-set/v2 v2.6.0
1515
github.com/distribution/reference v0.6.0
16-
github.com/docker/docker v27.3.1+incompatible
16+
github.com/docker/docker v27.4.0+incompatible
1717
github.com/go-openapi/runtime v0.28.0
1818
github.com/google/uuid v1.6.0
1919
github.com/goradd/maps v0.1.5
2020
github.com/gorilla/mux v1.8.1
2121
github.com/kubescape/backend v0.0.26
2222
github.com/kubescape/go-logger v0.0.23
23-
github.com/kubescape/k8s-interface v0.0.176
23+
github.com/kubescape/k8s-interface v0.0.183
2424
github.com/kubescape/kubescape-network-scanner v0.0.15
2525
github.com/kubescape/node-agent v0.2.152
2626
github.com/kubescape/opa-utils v0.0.278
@@ -31,15 +31,15 @@ require (
3131
github.com/testcontainers/testcontainers-go/modules/k3s v0.34.0
3232
github.com/zeebo/assert v1.3.1
3333
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.44.0
34-
go.opentelemetry.io/otel v1.30.0
35-
go.opentelemetry.io/otel/trace v1.30.0
34+
go.opentelemetry.io/otel v1.33.0
35+
go.opentelemetry.io/otel/trace v1.33.0
3636
golang.org/x/sync v0.10.0
3737
istio.io/pkg v0.0.0-20231221211216-7635388a563e
38-
k8s.io/api v0.31.0
39-
k8s.io/apimachinery v0.31.0
40-
k8s.io/apiserver v0.31.0
41-
k8s.io/client-go v0.31.0
42-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
38+
k8s.io/api v0.32.1
39+
k8s.io/apimachinery v0.32.1
40+
k8s.io/apiserver v0.32.0
41+
k8s.io/client-go v0.32.1
42+
k8s.io/utils v0.0.0-20241210054802-24370beab758
4343
sigs.k8s.io/yaml v1.4.0
4444
)
4545

@@ -68,15 +68,15 @@ require (
6868
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
6969
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
7070
github.com/lib/pq v1.10.9 // indirect
71-
github.com/montanaflynn/stats v0.7.0 // indirect
71+
github.com/montanaflynn/stats v0.7.1 // indirect
7272
github.com/streadway/amqp v1.1.0 // indirect
7373
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
7474
github.com/xdg-go/scram v1.1.2 // indirect
7575
github.com/xdg-go/stringprep v1.0.4 // indirect
76-
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
77-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
78-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
79-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
76+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
77+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
78+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
79+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
8080
k8s.io/apiextensions-apiserver v0.31.0 // indirect
8181
)
8282

@@ -95,10 +95,10 @@ require (
9595
github.com/OneOfOne/xxhash v1.2.8 // indirect
9696
github.com/acobaugh/osrelease v0.1.0 // indirect
9797
github.com/agnivade/levenshtein v1.1.1 // indirect
98-
github.com/anchore/go-logger v0.0.0-20240217160628-ee28a485904f // indirect
99-
github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f // indirect
100-
github.com/anchore/stereoscope v0.0.3 // indirect
101-
github.com/anchore/syft v1.13.0 // indirect
98+
github.com/anchore/go-logger v0.0.0-20241205183533-4fc29b5832e7 // indirect
99+
github.com/anchore/packageurl-go v0.1.1-0.20241018175412-5c22e6360c4f // indirect
100+
github.com/anchore/stereoscope v0.0.11 // indirect
101+
github.com/anchore/syft v1.18.1 // indirect
102102
github.com/armosec/gojay v1.2.17 // indirect
103103
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
104104
github.com/aws/aws-sdk-go v1.55.6-0.20240912145455-7112c0a0c2d0 // indirect
@@ -121,20 +121,19 @@ require (
121121
github.com/becheran/wildmatch-go v1.0.0 // indirect
122122
github.com/beorn7/perks v1.0.1 // indirect
123123
github.com/blang/semver/v4 v4.0.0 // indirect
124-
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
124+
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
125125
github.com/briandowns/spinner v1.23.1 // indirect
126126
github.com/cespare/xxhash/v2 v2.3.0 // indirect
127127
github.com/cilium/cilium v1.16.6 // indirect
128-
github.com/containerd/containerd v1.7.21 // indirect
129-
github.com/containerd/errdefs v0.1.0 // indirect
128+
github.com/containerd/errdefs v1.0.0 // indirect
130129
github.com/containerd/log v0.1.0 // indirect
131130
github.com/containerd/platforms v0.2.1 // indirect
132131
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
133132
github.com/containers/common v0.60.4 // indirect
134133
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
135134
github.com/cpuguy83/dockercfg v0.3.2 // indirect
136135
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
137-
github.com/docker/cli v27.2.1+incompatible // indirect
136+
github.com/docker/cli v27.4.0+incompatible // indirect
138137
github.com/docker/distribution v2.8.3+incompatible // indirect
139138
github.com/docker/docker-credential-helpers v0.8.2 // indirect
140139
github.com/docker/go-connections v0.5.0 // indirect
@@ -145,9 +144,9 @@ require (
145144
github.com/fatih/color v1.17.0 // indirect
146145
github.com/felixge/httpsnoop v1.0.4 // indirect
147146
github.com/francoispqt/gojay v1.2.13 // indirect
148-
github.com/fsnotify/fsnotify v1.7.0 // indirect
147+
github.com/fsnotify/fsnotify v1.8.0 // indirect
149148
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
150-
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
149+
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
151150
github.com/github/go-spdx/v2 v2.3.2 // indirect
152151
github.com/go-gota/gota v0.12.0 // indirect
153152
github.com/go-ini/ini v1.67.0 // indirect
@@ -166,7 +165,7 @@ require (
166165
github.com/gobwas/glob v0.2.3 // indirect
167166
github.com/gogo/protobuf v1.3.2 // indirect
168167
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
169-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
168+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
170169
github.com/golang/protobuf v1.5.4 // indirect
171170
github.com/golang/snappy v0.0.4 // indirect
172171
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
@@ -176,26 +175,25 @@ require (
176175
github.com/google/s2a-go v0.1.7 // indirect
177176
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
178177
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
179-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
178+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
180179
github.com/hashicorp/errwrap v1.1.0 // indirect
181180
github.com/hashicorp/go-multierror v1.1.1 // indirect
182181
github.com/hashicorp/go-version v1.7.0 // indirect
183-
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
184-
github.com/imdario/mergo v0.3.16 // indirect
182+
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
185183
github.com/inconshreveable/mousetrap v1.1.0 // indirect
186184
github.com/inspektor-gadget/inspektor-gadget v0.32.1-0.20240910080600-c7396e29cbf6 // indirect
187185
github.com/jinzhu/copier v0.4.0 // indirect
188186
github.com/jmespath/go-jmespath v0.4.0 // indirect
189187
github.com/josharian/intern v1.0.0 // indirect
190188
github.com/json-iterator/go v1.1.12 // indirect
191-
github.com/klauspost/compress v1.17.9 // indirect
189+
github.com/klauspost/compress v1.17.11 // indirect
192190
github.com/kubescape/kubescape/v3 v3.0.4 // indirect
193191
github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 // indirect
194192
github.com/kubescape/regolibrary v1.0.315 // indirect
195193
github.com/kylelemons/godebug v1.1.0 // indirect
196194
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
197195
github.com/mackerelio/go-osstat v0.2.5 // indirect
198-
github.com/magiconair/properties v1.8.7 // indirect
196+
github.com/magiconair/properties v1.8.9 // indirect
199197
github.com/mailru/easyjson v0.7.7 // indirect
200198
github.com/mattn/go-colorable v0.1.13 // indirect
201199
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -218,20 +216,20 @@ require (
218216
github.com/opencontainers/go-digest v1.0.0 // indirect
219217
github.com/opencontainers/image-spec v1.1.0 // indirect
220218
github.com/opencontainers/runtime-spec v1.2.0 // indirect
221-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
222-
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
223-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
219+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
220+
github.com/petermattis/goid v0.0.0-20241211131331-93ee7e083c43 // indirect
221+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
224222
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
225223
github.com/pkg/errors v0.9.1 // indirect
226224
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
227225
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
228226
github.com/pquerna/cachecontrol v0.2.0 // indirect
229-
github.com/prometheus/client_golang v1.20.3 // indirect
227+
github.com/prometheus/client_golang v1.20.5 // indirect
230228
github.com/prometheus/client_model v0.6.1 // indirect
231-
github.com/prometheus/common v0.55.0 // indirect
229+
github.com/prometheus/common v0.61.0 // indirect
232230
github.com/prometheus/procfs v0.15.1 // indirect
233231
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
234-
github.com/sagikazarmark/locafero v0.4.0 // indirect
232+
github.com/sagikazarmark/locafero v0.6.0 // indirect
235233
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
236234
github.com/sasha-s/go-deadlock v0.3.5 // indirect
237235
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e // indirect
@@ -246,7 +244,7 @@ require (
246244
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
247245
github.com/stripe/stripe-go/v74 v74.30.0 // indirect
248246
github.com/subosito/gotenv v1.6.0 // indirect
249-
github.com/sylabs/squashfs v1.0.0 // indirect
247+
github.com/sylabs/squashfs v1.0.4 // indirect
250248
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
251249
github.com/testcontainers/testcontainers-go v0.34.0 // indirect
252250
github.com/therootcompany/xz v1.0.1 // indirect
@@ -258,61 +256,62 @@ require (
258256
github.com/uptrace/uptrace-go v1.30.1 // indirect
259257
github.com/vbatts/tar-split v0.11.5 // indirect
260258
github.com/vishvananda/netlink v1.3.1-0.20241022031324-976bd8de7d81 // indirect
261-
github.com/vishvananda/netns v0.0.4 // indirect
259+
github.com/vishvananda/netns v0.0.5 // indirect
262260
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
263261
github.com/wagoodman/go-progress v0.0.0-20230925121702-07e42b3cdba0 // indirect
264262
github.com/x448/float16 v0.8.4 // indirect
265263
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
266264
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
267265
github.com/yashtewari/glob-intersection v0.2.0 // indirect
268266
github.com/yusufpapurcu/wmi v1.2.3 // indirect
269-
go.mongodb.org/mongo-driver v1.15.0 // indirect
267+
go.mongodb.org/mongo-driver v1.17.1 // indirect
270268
go.opencensus.io v0.24.0 // indirect
269+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
271270
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
272-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
271+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
273272
go.opentelemetry.io/contrib/instrumentation/runtime v0.55.0 // indirect
274273
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0 // indirect
275274
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0 // indirect
276-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
277-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0 // indirect
275+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
276+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
278277
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 // indirect
279278
go.opentelemetry.io/otel/log v0.6.0 // indirect
280-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
281-
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
279+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
280+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
282281
go.opentelemetry.io/otel/sdk/log v0.6.0 // indirect
283-
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
284-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
282+
go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
283+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
285284
go.uber.org/multierr v1.11.0 // indirect
286285
go.uber.org/zap v1.27.0 // indirect
287286
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
288287
golang.org/x/crypto v0.31.0 // indirect
289-
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
290-
golang.org/x/mod v0.21.0 // indirect
288+
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
289+
golang.org/x/mod v0.22.0 // indirect
291290
golang.org/x/net v0.33.0 // indirect
292-
golang.org/x/oauth2 v0.23.0 // indirect
291+
golang.org/x/oauth2 v0.24.0 // indirect
293292
golang.org/x/sys v0.28.0 // indirect
294293
golang.org/x/term v0.27.0 // indirect
295294
golang.org/x/text v0.21.0 // indirect
296-
golang.org/x/time v0.6.0 // indirect
295+
golang.org/x/time v0.8.0 // indirect
297296
gonum.org/v1/gonum v0.9.1 // indirect
298297
google.golang.org/api v0.177.0 // indirect
299298
google.golang.org/genproto v0.0.0-20240515191416-fc5f0ca64291 // indirect
300-
google.golang.org/genproto/googleapis/api v0.0.0-20241206012308-a4fef0638583 // indirect
301-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect
302-
google.golang.org/grpc v1.68.1 // indirect
299+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
300+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
301+
google.golang.org/grpc v1.69.0 // indirect
303302
google.golang.org/protobuf v1.35.2 // indirect
304303
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
305304
gopkg.in/inf.v0 v0.9.1 // indirect
306305
gopkg.in/ini.v1 v1.67.0 // indirect
307306
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
308307
gopkg.in/yaml.v2 v2.4.0 // indirect
309308
gopkg.in/yaml.v3 v3.0.1 // indirect
310-
k8s.io/component-base v0.31.0 // indirect
309+
k8s.io/component-base v0.32.1 // indirect
311310
k8s.io/klog/v2 v2.130.1 // indirect
312-
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect
311+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
313312
sigs.k8s.io/controller-runtime v0.19.0 // indirect
314-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
315-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
313+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
314+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
316315
)
317316

318317
replace github.com/project-copacetic/copacetic => github.com/anubhav06/copacetic v0.0.0-20230821175613-0a7915a62e10

0 commit comments

Comments
 (0)