Skip to content

Commit 64b5081

Browse files
authored
Merge pull request #1744 from fluxcd/update-deps-alpine
Update dependencies
2 parents 9244d6d + 6d5aabf commit 64b5081

File tree

4 files changed

+56
-126
lines changed

4 files changed

+56
-126
lines changed

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ARG GO_VERSION=1.23
2-
ARG XX_VERSION=1.4.0
2+
ARG XX_VERSION=1.6.1
33

44
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
5-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder
5+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
66

77
# copy build utilities
88
COPY --from=xx / /
@@ -29,7 +29,7 @@ RUN xx-go build \
2929
-ldflags "-s -w -X github.com/fluxcd/flagger/pkg/version.REVISION=${REVISON}" \
3030
-a -o flagger ./cmd/flagger
3131

32-
FROM alpine:3.20
32+
FROM alpine:3.21
3333

3434
RUN apk --no-cache add ca-certificates
3535

Dockerfile.loadtester

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ ARG REVISION
66

77
RUN apk --no-cache add alpine-sdk perl curl bash tar
88

9-
RUN HELM3_VERSION=3.15.3 && \
9+
RUN HELM3_VERSION=3.16.3 && \
1010
curl -sSL "https://get.helm.sh/helm-v${HELM3_VERSION}-linux-${TARGETARCH}.tar.gz" | tar xvz && \
1111
chmod +x linux-${TARGETARCH}/helm && mv linux-${TARGETARCH}/helm /usr/local/bin/helm
1212

13-
RUN KUBECTL_VERSION=v1.29.7 && \
13+
RUN KUBECTL_VERSION=v1.31.3 && \
1414
curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl" && \
1515
chmod +x kubectl && mv kubectl /usr/local/bin/kubectl
1616

17-
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.28 && \
17+
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.35 && \
1818
wget -qO /usr/local/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-${TARGETARCH} && \
1919
chmod +x /usr/local/bin/grpc_health_probe
2020

@@ -39,7 +39,7 @@ COPY pkg/ pkg/
3939
# build
4040
RUN CGO_ENABLED=0 go build -o loadtester ./cmd/loadtester/*
4141

42-
FROM bash:5.0
42+
FROM bash:5.2
4343

4444
ARG TARGETPLATFORM
4545

@@ -49,7 +49,7 @@ apk --no-cache add ca-certificates curl jq libgcc wrk hey git
4949

5050
WORKDIR /home/app
5151

52-
COPY --from=bats/bats:v1.1.0 /opt/bats/ /opt/bats/
52+
COPY --from=bats/bats:v1.1.1 /opt/bats/ /opt/bats/
5353
RUN ln -s /opt/bats/bin/bats /usr/local/bin/
5454

5555
COPY --from=builder /usr/local/bin/helm /usr/local/bin/

go.mod

+16-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/fluxcd/flagger
33
go 1.23.0
44

55
require (
6-
cloud.google.com/go/monitoring v1.21.2
6+
cloud.google.com/go/monitoring v1.22.0
77
github.com/Masterminds/semver/v3 v3.3.1
88
github.com/aws/aws-sdk-go v1.55.5
99
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -12,17 +12,17 @@ require (
1212
github.com/google/uuid v1.6.0
1313
github.com/googleapis/gax-go/v2 v2.14.0
1414
github.com/hashicorp/go-retryablehttp v0.7.7
15-
github.com/influxdata/influxdb-client-go/v2 v2.13.0
15+
github.com/influxdata/influxdb-client-go/v2 v2.14.0
1616
github.com/prometheus/client_golang v1.20.5
1717
github.com/signalfx/signalflow-client-go v0.1.0
18-
github.com/signalfx/signalfx-go v1.34.0
19-
github.com/stretchr/testify v1.9.0
18+
github.com/signalfx/signalfx-go v1.44.0
19+
github.com/stretchr/testify v1.10.0
2020
go.uber.org/zap v1.27.0
21-
golang.org/x/sync v0.9.0
22-
google.golang.org/api v0.205.0
21+
golang.org/x/sync v0.10.0
22+
google.golang.org/api v0.211.0
2323
google.golang.org/genproto v0.0.0-20241021214115-324edc3d5d38
2424
google.golang.org/grpc v1.67.1
25-
google.golang.org/protobuf v1.35.1
25+
google.golang.org/protobuf v1.35.2
2626
gopkg.in/h2non/gock.v1 v1.1.2
2727
k8s.io/api v0.31.3
2828
k8s.io/apimachinery v0.31.3
@@ -32,8 +32,8 @@ require (
3232
)
3333

3434
require (
35-
cloud.google.com/go/auth v0.10.1 // indirect
36-
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
35+
cloud.google.com/go/auth v0.12.1 // indirect
36+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
3737
cloud.google.com/go/compute/metadata v0.5.2 // indirect
3838
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3939
github.com/beorn7/perks v1.0.1 // indirect
@@ -73,23 +73,22 @@ require (
7373
github.com/prometheus/procfs v0.15.1 // indirect
7474
github.com/spf13/pflag v1.0.5 // indirect
7575
github.com/x448/float16 v0.8.4 // indirect
76-
go.opencensus.io v0.24.0 // indirect
7776
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
7877
go.opentelemetry.io/otel v1.29.0 // indirect
7978
go.opentelemetry.io/otel/metric v1.29.0 // indirect
8079
go.opentelemetry.io/otel/trace v1.29.0 // indirect
8180
go.uber.org/multierr v1.11.0 // indirect
82-
golang.org/x/crypto v0.29.0 // indirect
81+
golang.org/x/crypto v0.31.0 // indirect
8382
golang.org/x/mod v0.22.0 // indirect
84-
golang.org/x/net v0.31.0 // indirect
83+
golang.org/x/net v0.32.0 // indirect
8584
golang.org/x/oauth2 v0.24.0 // indirect
86-
golang.org/x/sys v0.27.0 // indirect
87-
golang.org/x/term v0.26.0 // indirect
88-
golang.org/x/text v0.20.0 // indirect
85+
golang.org/x/sys v0.28.0 // indirect
86+
golang.org/x/term v0.27.0 // indirect
87+
golang.org/x/text v0.21.0 // indirect
8988
golang.org/x/time v0.8.0 // indirect
9089
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
91-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
92-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
90+
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect
9392
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9493
gopkg.in/inf.v0 v0.9.1 // indirect
9594
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)