Skip to content

Commit 045ad11

Browse files
ks-ci-botks-ci-bot
authored
Merge pull request #338 from pixiake/release-1.0
update dependencies
2 parents 1e0c36d + 7a413c7 commit 045ad11

File tree

8 files changed

+550
-1447
lines changed

8 files changed

+550
-1447
lines changed

‎build/apiserver/Dockerfile‎

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

22
# Build the manager binary
3-
FROM golang:1.21 AS builder
3+
FROM golang:1.22 AS builder
44

55
#RUN #go env -w GOPROXY=https://goproxy.cn,direct
66
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

‎build/controller/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.21 AS builder
2+
FROM golang:1.22 AS builder
33

44
#ARG goproxy=https://goproxy.cn,direct
55
#ENV GOPROXY=$goproxy
@@ -13,7 +13,6 @@ COPY ../../cmd cmd/
1313
COPY ../../pkg/controllers controllers/
1414
COPY ../../pkg pkg/
1515
COPY ../../pkg/constant constant/
16-
COPY ../../plugins plugins/
1716
COPY ../../swaggerDocs swaggerDocs/
1817

1918
# Copy the Go Modules manifests

‎build/job/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# Build the manager binary
3-
FROM golang:1.21 AS builder
3+
FROM golang:1.22 AS builder
44

55
#RUN #go env -w GOPROXY=https://goproxy.cn,direct
66
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
@@ -16,7 +16,6 @@ COPY ../../cmd cmd/
1616
COPY ../../pkg/controllers controllers/
1717
COPY ../../pkg pkg/
1818
COPY ../../pkg/constant constant/
19-
COPY ../../plugins plugins/
2019
COPY ../../swaggerDocs swaggerDocs/
2120

2221

‎go.mod‎

Lines changed: 47 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,86 @@
11
module github.com/kubesphere/kubeeye
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
6-
github.com/aquasecurity/kube-bench v0.6.7
76
github.com/coreos/go-systemd/v22 v22.5.0
87
github.com/ghodss/yaml v1.0.0
98
github.com/gin-gonic/gin v1.9.1
109
github.com/kubesphere/event-rule-engine v0.0.0-20230602101348-c91b9b139a2c
11-
github.com/lithammer/dedent v1.1.0
1210
github.com/onsi/ginkgo v1.16.5
13-
github.com/onsi/gomega v1.18.1
11+
github.com/onsi/gomega v1.33.1
1412
github.com/open-policy-agent/opa v0.65.0
1513
github.com/pkg/errors v0.9.1
1614
github.com/prometheus/client_golang v1.19.1
17-
github.com/prometheus/common v0.48.0
18-
github.com/prometheus/procfs v0.12.0
15+
github.com/prometheus/common v0.55.0
16+
github.com/prometheus/procfs v0.15.1
1917
github.com/robfig/cron/v3 v3.0.1
2018
github.com/sergi/go-diff v1.3.1
21-
github.com/spf13/cobra v1.8.0
19+
github.com/spf13/cobra v1.8.1
2220
github.com/swaggo/files v1.0.1
2321
github.com/swaggo/gin-swagger v1.6.0
24-
github.com/swaggo/swag v1.16.1
22+
github.com/swaggo/swag v1.16.3
2523
github.com/xuri/excelize/v2 v2.8.1
26-
go.uber.org/zap v1.22.0
27-
golang.org/x/sys v0.20.0
28-
k8s.io/api v0.24.16
29-
k8s.io/apimachinery v0.24.16
30-
k8s.io/client-go v0.24.16
31-
k8s.io/code-generator v0.24.16
32-
k8s.io/klog/v2 v2.60.1
33-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
34-
sigs.k8s.io/controller-runtime v0.12.3
24+
go.uber.org/zap v1.26.0
25+
golang.org/x/sys v0.26.0
26+
k8s.io/api v0.31.0
27+
k8s.io/apimachinery v0.31.0
28+
k8s.io/client-go v0.31.0
29+
k8s.io/code-generator v0.31.0
30+
k8s.io/klog/v2 v2.130.1
31+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32+
sigs.k8s.io/controller-runtime v0.19.0
3533
)
3634

3735
require (
38-
cloud.google.com/go/compute v1.23.3 // indirect
39-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
40-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
41-
github.com/Azure/go-autorest/autorest v0.11.24 // indirect
42-
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
43-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
44-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
45-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
4636
github.com/KyleBanks/depth v1.2.1 // indirect
4737
github.com/OneOfOne/xxhash v1.2.8 // indirect
4838
github.com/agnivade/levenshtein v1.1.1 // indirect
4939
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
50-
github.com/aws/aws-sdk-go v1.44.51 // indirect
5140
github.com/beorn7/perks v1.0.1 // indirect
5241
github.com/bytedance/sonic v1.10.0-rc3 // indirect
53-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
42+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5443
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
5544
github.com/chenzhuoyu/iasm v0.9.0 // indirect
5645
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
57-
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
46+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5847
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
48+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5949
github.com/fsnotify/fsnotify v1.7.0 // indirect
50+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6051
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
6152
github.com/gin-contrib/sse v0.1.0 // indirect
6253
github.com/go-ini/ini v1.67.0 // indirect
6354
github.com/go-logr/logr v1.4.2 // indirect
6455
github.com/go-logr/stdr v1.2.2 // indirect
65-
github.com/go-logr/zapr v1.2.0 // indirect
66-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
67-
github.com/go-openapi/jsonreference v0.20.2 // indirect
68-
github.com/go-openapi/spec v0.20.9 // indirect
69-
github.com/go-openapi/swag v0.22.4 // indirect
56+
github.com/go-logr/zapr v1.3.0 // indirect
57+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
58+
github.com/go-openapi/jsonreference v0.21.0 // indirect
59+
github.com/go-openapi/spec v0.21.0 // indirect
60+
github.com/go-openapi/swag v0.23.0 // indirect
7061
github.com/go-playground/locales v0.14.1 // indirect
7162
github.com/go-playground/universal-translator v0.18.1 // indirect
7263
github.com/go-playground/validator/v10 v10.14.1 // indirect
7364
github.com/gobwas/glob v0.2.3 // indirect
7465
github.com/goccy/go-json v0.10.2 // indirect
7566
github.com/godbus/dbus/v5 v5.1.0 // indirect
7667
github.com/gogo/protobuf v1.3.2 // indirect
77-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
7868
github.com/golang/glog v1.2.0 // indirect
7969
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8070
github.com/golang/protobuf v1.5.4 // indirect
81-
github.com/google/gnostic v0.5.7-v3refs // indirect
71+
github.com/google/gnostic-models v0.6.8 // indirect
8272
github.com/google/go-cmp v0.6.0 // indirect
8373
github.com/google/gofuzz v1.2.0 // indirect
8474
github.com/google/uuid v1.6.0 // indirect
8575
github.com/gorilla/mux v1.8.1 // indirect
86-
github.com/hashicorp/hcl v1.0.0 // indirect
8776
github.com/imdario/mergo v0.3.12 // indirect
8877
github.com/inconshreveable/mousetrap v1.1.0 // indirect
89-
github.com/jmespath/go-jmespath v0.4.0 // indirect
9078
github.com/josharian/intern v1.0.0 // indirect
9179
github.com/json-iterator/go v1.1.12 // indirect
9280
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
9381
github.com/leodido/go-urn v1.2.4 // indirect
94-
github.com/magiconair/properties v1.8.7 // indirect
9582
github.com/mailru/easyjson v0.7.7 // indirect
9683
github.com/mattn/go-isatty v0.0.19 // indirect
97-
github.com/mitchellh/mapstructure v1.5.0 // indirect
9884
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9985
github.com/modern-go/reflect2 v1.0.2 // indirect
10086
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
@@ -105,52 +91,44 @@ require (
10591
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
10692
github.com/richardlehane/mscfb v1.0.4 // indirect
10793
github.com/richardlehane/msoleps v1.0.3 // indirect
108-
github.com/sagikazarmark/locafero v0.4.0 // indirect
109-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
11094
github.com/sirupsen/logrus v1.9.3 // indirect
111-
github.com/sourcegraph/conc v0.3.0 // indirect
112-
github.com/spf13/afero v1.11.0 // indirect
113-
github.com/spf13/cast v1.6.0 // indirect
11495
github.com/spf13/pflag v1.0.5 // indirect
115-
github.com/spf13/viper v1.18.2 // indirect
116-
github.com/subosito/gotenv v1.6.0 // indirect
11796
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
11897
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
11998
github.com/ugorji/go/codec v1.2.11 // indirect
99+
github.com/x448/float16 v0.8.4 // indirect
120100
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
121101
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
122102
github.com/xuri/efp v0.0.0-20231025114914-d1ff6096ae53 // indirect
123103
github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect
124104
github.com/yashtewari/glob-intersection v0.2.0 // indirect
125-
go.opentelemetry.io/otel v1.21.0 // indirect
126-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
127-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
128-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
129-
go.uber.org/atomic v1.9.0 // indirect
130-
go.uber.org/multierr v1.9.0 // indirect
105+
go.opentelemetry.io/otel v1.28.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
107+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
109+
go.uber.org/multierr v1.11.0 // indirect
131110
golang.org/x/arch v0.4.0 // indirect
132-
golang.org/x/crypto v0.23.0 // indirect
111+
golang.org/x/crypto v0.28.0 // indirect
133112
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
134-
golang.org/x/mod v0.14.0 // indirect
135-
golang.org/x/net v0.25.0 // indirect
136-
golang.org/x/oauth2 v0.16.0 // indirect
137-
golang.org/x/term v0.20.0 // indirect
138-
golang.org/x/text v0.15.0 // indirect
113+
golang.org/x/mod v0.21.0 // indirect
114+
golang.org/x/net v0.30.0 // indirect
115+
golang.org/x/oauth2 v0.21.0 // indirect
116+
golang.org/x/sync v0.8.0 // indirect
117+
golang.org/x/term v0.25.0 // indirect
118+
golang.org/x/text v0.19.0 // indirect
139119
golang.org/x/time v0.5.0 // indirect
140-
golang.org/x/tools v0.15.0 // indirect
141-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
142-
google.golang.org/appengine v1.6.7 // indirect
143-
google.golang.org/protobuf v1.33.0 // indirect
120+
golang.org/x/tools v0.26.0 // indirect
121+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
122+
google.golang.org/protobuf v1.34.2 // indirect
123+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
144124
gopkg.in/inf.v0 v0.9.1 // indirect
145-
gopkg.in/ini.v1 v1.67.0 // indirect
146125
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
147126
gopkg.in/yaml.v2 v2.4.0 // indirect
148127
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
k8s.io/apiextensions-apiserver v0.24.2 // indirect
150-
k8s.io/component-base v0.24.2 // indirect
151-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
152-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
153-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
154-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
128+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
129+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
130+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
131+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
132+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
155133
sigs.k8s.io/yaml v1.4.0 // indirect
156134
)

0 commit comments

Comments
 (0)