Skip to content

Commit f56f492

Browse files
masontikhonovmasontikhonov
authored
build: upgrade dependencies (#524)
1 parent 94dca60 commit f56f492

File tree

8 files changed

+223
-794
lines changed

8 files changed

+223
-794
lines changed

‎venona/Dockerfile‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
FROM golang:1.21-alpine3.18 as build
2-
1+
FROM golang:1.21-alpine3.20 AS build
32
RUN apk -U add --no-cache git make ca-certificates && update-ca-certificates
4-
53
ENV USER=venona
64
ENV UID=10001
7-
85
RUN adduser \
96
--disabled-password \
107
--gecos "" \
@@ -13,31 +10,23 @@ RUN adduser \
1310
--no-create-home \
1411
--uid "${UID}" \
1512
"${USER}"
16-
1713
WORKDIR /venona
18-
1914
COPY . .
2015
RUN go mod download -x
2116
RUN go mod verify
22-
2317
# compile
2418
RUN make build
2519

26-
FROM alpine:3.18
27-
20+
FROM alpine:3.20
2821
# copy ca-certs and user details
2922
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
3023
COPY --from=build /etc/passwd /etc/passwd
3124
COPY --from=build /etc/group /etc/group
32-
3325
WORKDIR /home/venona
3426
RUN chown -R venona:venona /home/venona && chmod 755 /home/venona
35-
3627
# copy binary
3728
COPY --from=build /venona/venona /usr/local/bin/venona
38-
3929
USER venona:venona
4030

4131
ENTRYPOINT [ "venona" ]
42-
4332
CMD [ "start" ]

‎venona/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.7
1+
1.10.8

‎venona/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/beorn7/perks v1.0.1 // indirect
2525
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2626
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
27+
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
2828
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2929
github.com/fsnotify/fsnotify v1.4.7 // indirect
3030
github.com/go-logr/logr v1.2.3 // indirect
@@ -62,11 +62,11 @@ require (
6262
github.com/spf13/cast v1.3.0 // indirect
6363
github.com/spf13/jwalterweatherman v1.0.0 // indirect
6464
github.com/subosito/gotenv v1.2.0 // indirect
65-
golang.org/x/net v0.8.0 // indirect
65+
golang.org/x/net v0.17.0 // indirect
6666
golang.org/x/oauth2 v0.5.0 // indirect
67-
golang.org/x/sys v0.8.0 // indirect
68-
golang.org/x/term v0.6.0 // indirect
69-
golang.org/x/text v0.8.0 // indirect
67+
golang.org/x/sys v0.13.0 // indirect
68+
golang.org/x/term v0.13.0 // indirect
69+
golang.org/x/text v0.13.0 // indirect
7070
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
7171
google.golang.org/appengine v1.6.7 // indirect
7272
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect

‎venona/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
4444
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
4545
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
4646
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
47-
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
48-
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
47+
github.com/emicklei/go-restful/v3 v3.10.0 h1:X4gma4HM7hFm6WMeAsTfqA0GOfdNoCzBIkHGoRLGXuM=
48+
github.com/emicklei/go-restful/v3 v3.10.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
4949
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
5050
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
5151
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
@@ -346,8 +346,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
346346
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
347347
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
348348
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
349-
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
350-
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
349+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
350+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
351351
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
352352
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
353353
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -374,16 +374,16 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
374374
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
375375
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
376376
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
377-
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
378-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
379-
golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
380-
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
377+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
378+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
379+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
380+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
381381
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
382382
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
383383
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
384384
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
385-
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
386-
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
385+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
386+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
387387
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
388388
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
389389
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=

‎venonactl/Dockerfile‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
1-
FROM golang:1.19-alpine3.17 as build
2-
1+
FROM golang:1.21-alpine3.20 AS build
32
WORKDIR /venona
4-
53
COPY go.mod .
64
RUN go mod download
7-
85
RUN apk add git
9-
106
COPY . .
11-
127
ARG COMMIT
13-
148
RUN VERSION=$(cat VERSION) \
159
DATE=$(date -u "+%Y-%m-%dT%TZ") && \
1610
env CGO_ENABLED=0 \
1711
go build -ldflags="-w -X github.com/codefresh-io/venona/venonactl/cmd.version=${VERSION} \
1812
-X github.com/codefresh-io/venona/venonactl/cmd.commit=${COMMIT} -X github.com/codefresh-io/venona/venonactl/cmd.date=${DATE}" \
1913
-o venona
2014

21-
FROM alpine:3.17
22-
15+
FROM alpine:3.20
2316
RUN apk add --update ca-certificates
24-
2517
COPY --from=build /venona/venona /usr/local/bin/venona
2618

2719
ENTRYPOINT [ "venona" ]
28-
29-
CMD [ "--help" ]
20+
CMD [ "--help" ]

‎venonactl/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.7
1+
1.10.8

‎venonactl/go.mod‎

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/codefresh-io/venona/venonactl
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/Masterminds/semver v1.5.0
@@ -10,49 +10,50 @@ require (
1010
github.com/dustin/go-humanize v1.0.1
1111
github.com/inconshreveable/log15 v2.16.0+incompatible
1212
github.com/olekukonko/tablewriter v0.0.5
13-
github.com/spf13/cobra v1.6.1
13+
github.com/spf13/cobra v1.8.0
1414
github.com/spf13/viper v1.15.0
1515
github.com/stretchr/objx v0.5.0
1616
gopkg.in/yaml.v2 v2.4.0
17-
helm.sh/helm/v3 v3.11.1
18-
k8s.io/api v0.26.2
19-
k8s.io/apimachinery v0.26.2
20-
k8s.io/client-go v0.26.2
17+
helm.sh/helm/v3 v3.14.4
18+
k8s.io/api v0.29.0
19+
k8s.io/apimachinery v0.29.0
20+
k8s.io/client-go v0.29.0
2121
)
2222

2323
require (
24+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2425
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2526
github.com/Masterminds/goutils v1.1.1 // indirect
26-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
27-
github.com/Microsoft/go-winio v0.6.0 // indirect
28-
github.com/Microsoft/hcsshim v0.9.7 // indirect
27+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
28+
github.com/Microsoft/hcsshim v0.11.4 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/cespare/xxhash/v2 v2.2.0 // indirect
31-
github.com/containerd/containerd v1.6.19 // indirect
32-
github.com/containerd/continuity v0.3.0 // indirect
31+
github.com/containerd/containerd v1.7.12 // indirect
32+
github.com/containerd/log v0.1.0 // indirect
3333
github.com/davecgh/go-spew v1.1.1 // indirect
34-
github.com/docker/cli v23.0.1+incompatible // indirect
35-
github.com/docker/distribution v2.8.1+incompatible // indirect
36-
github.com/docker/docker v23.0.1+incompatible // indirect
34+
github.com/docker/cli v24.0.6+incompatible // indirect
35+
github.com/docker/distribution v2.8.2+incompatible // indirect
36+
github.com/docker/docker v24.0.9+incompatible // indirect
3737
github.com/docker/docker-credential-helpers v0.7.0 // indirect
3838
github.com/docker/go-connections v0.4.0 // indirect
3939
github.com/docker/go-metrics v0.0.1 // indirect
4040
github.com/docker/go-units v0.5.0 // indirect
41-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
42-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
41+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
42+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
4343
github.com/fatih/color v1.14.1 // indirect
44+
github.com/felixge/httpsnoop v1.0.3 // indirect
4445
github.com/fsnotify/fsnotify v1.6.0 // indirect
4546
github.com/go-errors/errors v1.4.2 // indirect
46-
github.com/go-logr/logr v1.2.3 // indirect
47+
github.com/go-logr/logr v1.3.0 // indirect
48+
github.com/go-logr/stdr v1.2.2 // indirect
4749
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4850
github.com/go-openapi/jsonreference v0.20.2 // indirect
4951
github.com/go-openapi/swag v0.22.3 // indirect
5052
github.com/go-stack/stack v1.8.1 // indirect
5153
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang/protobuf v1.5.2 // indirect
54+
github.com/golang/protobuf v1.5.3 // indirect
5355
github.com/google/btree v1.1.2 // indirect
54-
github.com/google/gnostic v0.6.9 // indirect
55-
github.com/google/go-cmp v0.5.9 // indirect
56+
github.com/google/gnostic-models v0.6.8 // indirect
5657
github.com/google/go-querystring v1.1.0 // indirect
5758
github.com/google/gofuzz v1.2.0 // indirect
5859
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -77,60 +78,57 @@ require (
7778
github.com/mitchellh/mapstructure v1.5.0 // indirect
7879
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7980
github.com/moby/locker v1.0.1 // indirect
81+
github.com/moby/term v0.5.0 // indirect
8082
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8183
github.com/modern-go/reflect2 v1.0.2 // indirect
8284
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
8385
github.com/morikuni/aec v1.0.0 // indirect
8486
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8587
github.com/opencontainers/go-digest v1.0.0 // indirect
86-
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
87-
github.com/opencontainers/runc v1.1.4 // indirect
88+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
8889
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
8990
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
9091
github.com/pkg/errors v0.9.1 // indirect
91-
github.com/prometheus/client_golang v1.14.0 // indirect
92-
github.com/prometheus/client_model v0.3.0 // indirect
93-
github.com/prometheus/common v0.41.0 // indirect
94-
github.com/prometheus/procfs v0.9.0 // indirect
92+
github.com/prometheus/client_golang v1.16.0 // indirect
93+
github.com/prometheus/client_model v0.4.0 // indirect
94+
github.com/prometheus/common v0.44.0 // indirect
95+
github.com/prometheus/procfs v0.10.1 // indirect
9596
github.com/rivo/uniseg v0.4.4 // indirect
96-
github.com/sirupsen/logrus v1.9.0 // indirect
97+
github.com/sirupsen/logrus v1.9.3 // indirect
9798
github.com/spf13/afero v1.9.5 // indirect
9899
github.com/spf13/cast v1.5.0 // indirect
99100
github.com/spf13/jwalterweatherman v1.1.0 // indirect
100101
github.com/spf13/pflag v1.0.5 // indirect
101102
github.com/subosito/gotenv v1.4.2 // indirect
102-
github.com/xlab/treeprint v1.1.0 // indirect
103-
go.starlark.net v0.0.0-20230302034142-4b1e35fe2254 // indirect
104-
golang.org/x/crypto v0.7.0 // indirect
105-
golang.org/x/mod v0.9.0 // indirect
106-
golang.org/x/net v0.8.0 // indirect
107-
golang.org/x/oauth2 v0.6.0 // indirect
108-
golang.org/x/sync v0.1.0 // indirect
109-
golang.org/x/sys v0.6.0 // indirect
110-
golang.org/x/term v0.6.0 // indirect
111-
golang.org/x/text v0.8.0 // indirect
103+
github.com/xlab/treeprint v1.2.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
105+
go.opentelemetry.io/otel v1.19.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
107+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
108+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
109+
golang.org/x/crypto v0.29.0 // indirect
110+
golang.org/x/net v0.31.0 // indirect
111+
golang.org/x/oauth2 v0.10.0 // indirect
112+
golang.org/x/sync v0.9.0 // indirect
113+
golang.org/x/sys v0.27.0 // indirect
114+
golang.org/x/term v0.26.0 // indirect
115+
golang.org/x/text v0.20.0 // indirect
112116
golang.org/x/time v0.3.0 // indirect
113-
golang.org/x/tools v0.7.0 // indirect
114117
google.golang.org/appengine v1.6.7 // indirect
115-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
116-
google.golang.org/grpc v1.53.0 // indirect
117-
google.golang.org/protobuf v1.28.1 // indirect
118+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
119+
google.golang.org/grpc v1.58.3 // indirect
120+
google.golang.org/protobuf v1.33.0 // indirect
118121
gopkg.in/inf.v0 v0.9.1 // indirect
119122
gopkg.in/ini.v1 v1.67.0 // indirect
120123
gopkg.in/yaml.v3 v3.0.1 // indirect
121-
k8s.io/cli-runtime v0.26.2 // indirect
122-
k8s.io/klog/v2 v2.90.1 // indirect
123-
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
124-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
125-
oras.land/oras-go v1.2.2 // indirect
124+
k8s.io/cli-runtime v0.29.0 // indirect
125+
k8s.io/klog/v2 v2.110.1 // indirect
126+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
127+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
128+
oras.land/oras-go v1.2.4 // indirect
126129
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
127-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
128-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
129-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
130+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
131+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
132+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
130133
sigs.k8s.io/yaml v1.3.0 // indirect
131134
)
132-
133-
replace (
134-
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
135-
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
136-
)

0 commit comments

Comments
 (0)