Skip to content

Commit 583b4d1

Browse files
TylerGillsonTylerGillson
authored
Merge pull request #18 from spectrocloud-labs/chore/upgrade-go-1.22
chore: fix failing CI checks
2 parents 5fa1a9b + eb6ab5a commit 583b4d1

File tree

5 files changed

+72
-223
lines changed

5 files changed

+72
-223
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
140140

141141
## Tool Versions
142142
KUSTOMIZE_VERSION ?= v5.0.1
143-
CONTROLLER_TOOLS_VERSION ?= v0.12.0
143+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
144144

145145
.PHONY: kustomize
146146
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/validation.spectrocloud.labs_kubescapevalidators.yaml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: kubescapevalidators.validation.spectrocloud.labs
88
spec:
99
group: validation.spectrocloud.labs
@@ -21,14 +21,19 @@ spec:
2121
API
2222
properties:
2323
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2729
type: string
2830
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3237
type: string
3338
metadata:
3439
type: object

‎go.mod‎

Lines changed: 17 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
11
module github.com/spectrocloud-labs/validator-plugin-kubescape
22

3-
go 1.21.6
4-
5-
toolchain go1.21.8
3+
go 1.22
64

75
require (
86
github.com/go-logr/logr v1.4.1
97
github.com/kubescape/kubevuln v0.3.3-0.20240326161027-4780cf609919
10-
github.com/kubescape/storage v0.0.74
8+
github.com/kubescape/storage v0.0.83
119
github.com/onsi/ginkgo/v2 v2.16.0
1210
github.com/onsi/gomega v1.31.1
1311
github.com/spectrocloud-labs/validator v0.0.38
12+
k8s.io/api v0.29.2
1413
k8s.io/apimachinery v0.29.3
1514
k8s.io/client-go v0.29.2
1615
sigs.k8s.io/cluster-api v1.6.2
1716
sigs.k8s.io/controller-runtime v0.17.2
1817
)
1918

2019
require (
21-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
22-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
23-
github.com/Microsoft/go-winio v0.6.1 // indirect
24-
github.com/Microsoft/hcsshim v0.11.4 // indirect
2520
github.com/acobaugh/osrelease v0.1.0 // indirect
26-
github.com/adrg/xdg v0.4.0 // indirect
27-
github.com/anchore/clio v0.0.0-20231016125544-c98a83e1c7fc // indirect
28-
github.com/anchore/fangs v0.0.0-20231201140849-5075d28d6d8b // indirect
2921
github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a // indirect
30-
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 // indirect
31-
github.com/anchore/stereoscope v0.0.0-20240118133533-eb656fc71793 // indirect
32-
github.com/anchore/syft v0.101.1 // indirect
33-
github.com/andybalholm/brotli v1.0.4 // indirect
22+
github.com/anchore/packageurl-go v0.1.1-0.20240312213626-055233e539b4 // indirect
23+
github.com/anchore/stereoscope v0.0.3-0.20240423181235-8b297badafd5 // indirect
24+
github.com/anchore/syft v1.3.0 // indirect
3425
github.com/armosec/armoapi-go v0.0.330 // indirect
3526
github.com/armosec/gojay v1.2.15 // indirect
3627
github.com/armosec/utils-go v0.0.57 // indirect
@@ -43,32 +34,18 @@ require (
4334
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
4435
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
4536
github.com/cespare/xxhash/v2 v2.2.0 // indirect
46-
github.com/containerd/cgroups v1.1.0 // indirect
4737
github.com/containerd/containerd v1.7.11 // indirect
48-
github.com/containerd/continuity v0.4.2 // indirect
49-
github.com/containerd/fifo v1.1.0 // indirect
50-
github.com/containerd/log v0.1.0 // indirect
51-
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
52-
github.com/containerd/ttrpc v1.2.2 // indirect
53-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
5438
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
5539
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
56-
github.com/distribution/reference v0.5.0 // indirect
5740
github.com/docker/cli v24.0.0+incompatible // indirect
58-
github.com/docker/distribution v2.8.3+incompatible // indirect
59-
github.com/docker/docker v25.0.1+incompatible // indirect
41+
github.com/docker/docker v26.1.0+incompatible // indirect
6042
github.com/docker/docker-credential-helpers v0.7.0 // indirect
6143
github.com/docker/go-connections v0.4.0 // indirect
62-
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
63-
github.com/docker/go-units v0.5.0 // indirect
64-
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
6544
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
6645
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6746
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
6847
github.com/facebookincubator/nvdtools v0.1.5 // indirect
6948
github.com/fatih/color v1.16.0 // indirect
70-
github.com/felixge/fgprof v0.9.3 // indirect
71-
github.com/felixge/httpsnoop v1.0.4 // indirect
7249
github.com/francoispqt/gojay v1.2.13 // indirect
7350
github.com/fsnotify/fsnotify v1.7.0 // indirect
7451
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
@@ -83,60 +60,42 @@ require (
8360
github.com/gogo/protobuf v1.3.2 // indirect
8461
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8562
github.com/golang/protobuf v1.5.4 // indirect
86-
github.com/golang/snappy v0.0.4 // indirect
8763
github.com/google/gnostic-models v0.6.8 // indirect
8864
github.com/google/go-cmp v0.6.0 // indirect
89-
github.com/google/go-containerregistry v0.19.0 // indirect
65+
github.com/google/go-containerregistry v0.19.1 // indirect
9066
github.com/google/gofuzz v1.2.0 // indirect
91-
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
92-
github.com/google/uuid v1.5.0 // indirect
93-
github.com/gookit/color v1.5.4 // indirect
67+
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
68+
github.com/google/uuid v1.6.0 // indirect
9469
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
9570
github.com/hashicorp/errwrap v1.1.0 // indirect
9671
github.com/hashicorp/go-multierror v1.1.1 // indirect
9772
github.com/hashicorp/hcl v1.0.0 // indirect
98-
github.com/iancoleman/strcase v0.3.0 // indirect
9973
github.com/imdario/mergo v0.3.15 // indirect
100-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10174
github.com/jinzhu/copier v0.4.0 // indirect
10275
github.com/josharian/intern v1.0.0 // indirect
10376
github.com/json-iterator/go v1.1.12 // indirect
104-
github.com/klauspost/compress v1.17.0 // indirect
105-
github.com/klauspost/pgzip v1.2.5 // indirect
77+
github.com/klauspost/compress v1.17.4 // indirect
10678
github.com/kubescape/go-logger v0.0.22 // indirect
10779
github.com/kubescape/k8s-interface v0.0.162 // indirect
10880
github.com/magiconair/properties v1.8.7 // indirect
10981
github.com/mailru/easyjson v0.7.7 // indirect
11082
github.com/mattn/go-colorable v0.1.13 // indirect
11183
github.com/mattn/go-isatty v0.0.20 // indirect
11284
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
113-
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
114-
github.com/mholt/archiver/v3 v3.5.1 // indirect
11585
github.com/mitchellh/go-homedir v1.1.0 // indirect
11686
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
11787
github.com/mitchellh/mapstructure v1.5.0 // indirect
118-
github.com/moby/locker v1.0.1 // indirect
119-
github.com/moby/sys/mountinfo v0.6.2 // indirect
120-
github.com/moby/sys/sequential v0.5.0 // indirect
121-
github.com/moby/sys/signal v0.7.0 // indirect
12288
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
12389
github.com/modern-go/reflect2 v1.0.2 // indirect
12490
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
125-
github.com/nwaples/rardecode v1.1.0 // indirect
12691
github.com/olvrng/ujson v1.1.0 // indirect
12792
github.com/opencontainers/go-digest v1.0.0 // indirect
12893
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
129-
github.com/opencontainers/runc v1.1.12 // indirect
130-
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
131-
github.com/opencontainers/selinux v1.11.0 // indirect
13294
github.com/openvex/go-vex v0.2.5 // indirect
13395
github.com/package-url/packageurl-go v0.1.1 // indirect
134-
github.com/pborman/indent v1.2.1 // indirect
135-
github.com/pelletier/go-toml v1.9.5 // indirect
13696
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
13797
github.com/pierrec/lz4/v4 v4.1.15 // indirect
13898
github.com/pkg/errors v0.9.1 // indirect
139-
github.com/pkg/profile v1.7.0 // indirect
14099
github.com/pquerna/cachecontrol v0.2.0 // indirect
141100
github.com/prometheus/client_golang v1.18.0 // indirect
142101
github.com/prometheus/client_model v0.5.0 // indirect
@@ -149,25 +108,18 @@ require (
149108
github.com/sourcegraph/conc v0.3.0 // indirect
150109
github.com/spf13/afero v1.11.0 // indirect
151110
github.com/spf13/cast v1.5.1 // indirect
152-
github.com/spf13/cobra v1.8.0 // indirect
153111
github.com/spf13/pflag v1.0.5 // indirect
154112
github.com/spf13/viper v1.17.0 // indirect
155113
github.com/stripe/stripe-go/v74 v74.28.0 // indirect
156114
github.com/subosito/gotenv v1.6.0 // indirect
157-
github.com/sylabs/sif/v2 v2.11.5 // indirect
158115
github.com/sylabs/squashfs v0.6.1 // indirect
159116
github.com/therootcompany/xz v1.0.1 // indirect
160117
github.com/ulikunitz/xz v0.5.11 // indirect
161118
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.2 // indirect
162119
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.2 // indirect
163120
github.com/uptrace/uptrace-go v1.18.0 // indirect
164-
github.com/vbatts/tar-split v0.11.3 // indirect
165121
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
166122
github.com/wagoodman/go-progress v0.0.0-20230925121702-07e42b3cdba0 // indirect
167-
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
168-
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
169-
go.opencensus.io v0.24.0 // indirect
170-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
171123
go.opentelemetry.io/contrib/instrumentation/runtime v0.44.0 // indirect
172124
go.opentelemetry.io/otel v1.20.0 // indirect
173125
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 // indirect
@@ -182,20 +134,17 @@ require (
182134
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
183135
go.uber.org/multierr v1.11.0 // indirect
184136
go.uber.org/zap v1.26.0 // indirect
185-
golang.org/x/crypto v0.19.0 // indirect
137+
golang.org/x/crypto v0.22.0 // indirect
186138
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
187-
golang.org/x/mod v0.14.0 // indirect
188-
golang.org/x/net v0.21.0 // indirect
189-
golang.org/x/oauth2 v0.15.0 // indirect
190-
golang.org/x/sync v0.6.0 // indirect
191-
golang.org/x/sys v0.17.0 // indirect
192-
golang.org/x/term v0.17.0 // indirect
139+
golang.org/x/net v0.24.0 // indirect
140+
golang.org/x/oauth2 v0.18.0 // indirect
141+
golang.org/x/sys v0.19.0 // indirect
142+
golang.org/x/term v0.19.0 // indirect
193143
golang.org/x/text v0.14.0 // indirect
194144
golang.org/x/time v0.5.0 // indirect
195-
golang.org/x/tools v0.17.0 // indirect
145+
golang.org/x/tools v0.19.0 // indirect
196146
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
197147
google.golang.org/appengine v1.6.7 // indirect
198-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
199148
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
200149
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
201150
google.golang.org/grpc v1.59.0 // indirect
@@ -205,7 +154,6 @@ require (
205154
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
206155
gopkg.in/yaml.v2 v2.4.0 // indirect
207156
gopkg.in/yaml.v3 v3.0.1 // indirect
208-
k8s.io/api v0.29.2 // indirect
209157
k8s.io/apiextensions-apiserver v0.29.0 // indirect
210158
k8s.io/component-base v0.29.0 // indirect
211159
k8s.io/klog/v2 v2.120.1 // indirect

0 commit comments

Comments
 (0)