Skip to content

Commit 92c967d

Browse files
PavelYadrovPavelYadrov
committed
feat: Upgrade base and 3rd party versions to avoid vulnerabilities
1 parent 2445bf5 commit 92c967d

File tree

10 files changed

+198
-786
lines changed

10 files changed

+198
-786
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.24-alpine3.21 as builder
2+
FROM --platform=$BUILDPLATFORM golang:1.24.4-alpine3.22 as builder
33
ARG BUILDPLATFORM
44
ARG TARGETOS
55
ARG TARGETARCH

‎docker-zookeeper/docker/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.22.4-alpine3.20 as builder
1+
FROM --platform=$BUILDPLATFORM golang:1.24.4-alpine3.22 as builder
22
ARG BUILDPLATFORM
33
ARG TARGETOS
44
ARG TARGETARCH
@@ -19,7 +19,7 @@ COPY main.go main.go
1919
# Build
2020
RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o zookeeper-assistant main.go
2121

22-
FROM eclipse-temurin:22.0.1_8-jdk-alpine
22+
FROM eclipse-temurin:21.0.7_6-jdk-alpine-3.21
2323

2424
ENV ZOOKEEPER_HOME=/opt/zookeeper \
2525
ZOOKEEPER_OPT=/var/opt/zookeeper \
@@ -84,7 +84,7 @@ RUN set -x \
8484
&& mkdir -p ${ZOOKEEPER_OPT} \
8585
&& mkdir -p ${ZOOKEEPER_DATA}
8686

87-
ARG JOLOKIA_VERSION="1.7.1"
87+
ARG JOLOKIA_VERSION="1.7.2"
8888
# Download Jolokia
8989
RUN set -x \
9090
&& wget \

‎docker-zookeeper/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module mod
22

3-
go 1.22
3+
go 1.24
44

55
require (
6-
github.com/go-zookeeper/zk v1.0.2
7-
github.com/gorilla/handlers v1.5.1
8-
github.com/gorilla/mux v1.8.0
6+
github.com/go-zookeeper/zk v1.0.4
7+
github.com/gorilla/handlers v1.5.2
8+
github.com/gorilla/mux v1.8.1
99
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
10-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
10+
golang.org/x/sync v0.15.0
1111
)
1212

13-
require github.com/felixge/httpsnoop v1.0.1 // indirect
13+
require github.com/felixge/httpsnoop v1.0.4 // indirect

‎docker-zookeeper/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
2-
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
3-
github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM=
4-
github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
5-
github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
6-
github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
7-
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
8-
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
1+
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
2+
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
3+
github.com/go-zookeeper/zk v1.0.4 h1:DPzxraQx7OrPyXq2phlGlNSIyWEsAox0RJmjTseMV6I=
4+
github.com/go-zookeeper/zk v1.0.4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
5+
github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
6+
github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
7+
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
8+
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
99
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
1010
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
11-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
12-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
12+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=

‎go.mod‎

Lines changed: 45 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
module github.com/Netcracker/qubership-zookeeper
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
6-
github.com/go-logr/logr v0.4.0
6+
github.com/go-logr/logr v1.4.3
77
github.com/hashicorp/vault/api v1.20.0
88
github.com/sethvargo/go-password v0.3.1
9-
k8s.io/api v0.22.1
10-
k8s.io/apimachinery v0.22.1
11-
k8s.io/client-go v0.22.1
12-
sigs.k8s.io/controller-runtime v0.10.0
9+
k8s.io/api v0.33.0
10+
k8s.io/apimachinery v0.33.0
11+
k8s.io/client-go v0.33.0
12+
sigs.k8s.io/controller-runtime v0.15.0
1313
)
1414

1515
require (
16-
cloud.google.com/go v0.54.0 // indirect
17-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
18-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
19-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
20-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
21-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
22-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2316
github.com/beorn7/perks v1.0.1 // indirect
2417
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
25-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
18+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2619
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
28-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
29-
github.com/fsnotify/fsnotify v1.4.9 // indirect
20+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
21+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
22+
github.com/fsnotify/fsnotify v1.7.0 // indirect
23+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3024
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
31-
github.com/go-logr/zapr v0.4.0 // indirect
25+
github.com/go-logr/zapr v1.3.0 // indirect
26+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
27+
github.com/go-openapi/jsonreference v0.20.2 // indirect
28+
github.com/go-openapi/swag v0.23.0 // indirect
3229
github.com/gogo/protobuf v1.3.2 // indirect
33-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
34-
github.com/golang/protobuf v1.5.2 // indirect
35-
github.com/google/go-cmp v0.6.0 // indirect
36-
github.com/google/gofuzz v1.1.0 // indirect
37-
github.com/google/uuid v1.1.2 // indirect
38-
github.com/googleapis/gnostic v0.5.5 // indirect
30+
github.com/google/gnostic-models v0.6.9 // indirect
31+
github.com/google/go-cmp v0.7.0 // indirect
32+
github.com/google/uuid v1.6.0 // indirect
3933
github.com/hashicorp/errwrap v1.1.0 // indirect
4034
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
4135
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -45,41 +39,43 @@ require (
4539
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
4640
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
4741
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
48-
github.com/imdario/mergo v0.3.12 // indirect
49-
github.com/json-iterator/go v1.1.11 // indirect
50-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
42+
github.com/josharian/intern v1.0.0 // indirect
43+
github.com/json-iterator/go v1.1.12 // indirect
44+
github.com/mailru/easyjson v0.7.7 // indirect
5145
github.com/mitchellh/go-homedir v1.1.0 // indirect
5246
github.com/mitchellh/mapstructure v1.5.0 // indirect
5347
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
54-
github.com/modern-go/reflect2 v1.0.1 // indirect
48+
github.com/modern-go/reflect2 v1.0.2 // indirect
49+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5550
github.com/pkg/errors v0.9.1 // indirect
56-
github.com/prometheus/client_golang v1.11.1 // indirect
57-
github.com/prometheus/client_model v0.2.0 // indirect
58-
github.com/prometheus/common v0.26.0 // indirect
59-
github.com/prometheus/procfs v0.6.0 // indirect
51+
github.com/prometheus/client_golang v1.22.0 // indirect
52+
github.com/prometheus/client_model v0.6.1 // indirect
53+
github.com/prometheus/common v0.62.0 // indirect
54+
github.com/prometheus/procfs v0.15.1 // indirect
6055
github.com/ryanuber/go-glob v1.0.0 // indirect
6156
github.com/spf13/pflag v1.0.5 // indirect
62-
go.uber.org/atomic v1.7.0 // indirect
63-
go.uber.org/multierr v1.6.0 // indirect
64-
go.uber.org/zap v1.19.0 // indirect
57+
github.com/x448/float16 v0.8.4 // indirect
58+
go.uber.org/multierr v1.11.0 // indirect
59+
go.uber.org/zap v1.27.0 // indirect
6560
golang.org/x/crypto v0.36.0 // indirect
66-
golang.org/x/net v0.37.0 // indirect
67-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
61+
golang.org/x/net v0.38.0 // indirect
62+
golang.org/x/oauth2 v0.27.0 // indirect
6863
golang.org/x/sys v0.31.0 // indirect
6964
golang.org/x/term v0.30.0 // indirect
7065
golang.org/x/text v0.23.0 // indirect
71-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
72-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
73-
google.golang.org/appengine v1.6.7 // indirect
74-
google.golang.org/protobuf v1.33.0 // indirect
66+
golang.org/x/time v0.9.0 // indirect
67+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
68+
google.golang.org/protobuf v1.36.5 // indirect
69+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7570
gopkg.in/inf.v0 v0.9.1 // indirect
76-
gopkg.in/yaml.v2 v2.4.0 // indirect
7771
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.22.1 // indirect
79-
k8s.io/component-base v0.22.1 // indirect
80-
k8s.io/klog/v2 v2.9.0 // indirect
81-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
82-
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
83-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
84-
sigs.k8s.io/yaml v1.2.0 // indirect
72+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
73+
k8s.io/component-base v0.33.0 // indirect
74+
k8s.io/klog/v2 v2.130.1 // indirect
75+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
76+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
77+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
78+
sigs.k8s.io/randfill v1.0.0 // indirect
79+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
80+
sigs.k8s.io/yaml v1.4.0 // indirect
8581
)

0 commit comments

Comments
 (0)