Skip to content

Commit 15262ac

Browse files
AgalinAgalin
committed
chore(deps): update golang to 1.25.5 and all dependencies (#49)
This includes small changes to CNPG APIs and dagger bump. Signed-off-by: Szymon Soloch <[email protected]>
1 parent 23d7807 commit 15262ac

File tree

22 files changed

+675
-545
lines changed

22 files changed

+675
-545
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install Dagger
4040
env:
4141
# renovate: datasource=github-tags depName=dagger/dagger versioning=semver
42-
DAGGER_VERSION: 0.18.5
42+
DAGGER_VERSION: 0.19.8
4343
run: |
4444
curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
4545
- name: Run CI task

‎.github/workflows/release-please.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install Dagger
2323
env:
2424
# renovate: datasource=github-tags depName=dagger/dagger versioning=semver
25-
DAGGER_VERSION: 0.18.5
25+
DAGGER_VERSION: 0.19.8
2626
run: |
2727
curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
2828
- name: Create image and manifest

‎.github/workflows/release-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Install Dagger
1515
env:
1616
# renovate: datasource=github-tags depName=dagger/dagger versioning=semver
17-
DAGGER_VERSION: 0.18.5
17+
DAGGER_VERSION: 0.19.8
1818
run: |
1919
curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
2020
- name: Create image and manifest

‎Taskfile.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ tasks:
1919
desc: Run golangci-lint
2020
env:
2121
# renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
22-
DAGGER_GOLANGCI_LINT_SHA: 96c13b929c636316317f745ff36cda4e4c66f680
22+
DAGGER_GOLANGCI_LINT_SHA: 6133ad18e131b891d4723b8e25d69f5de077b472
23+
# renovate: datasource=docker depName=golang versioning=semver
24+
GOLANG_IMAGE_VERSION: 1.25.5
2325
cmds:
2426
- >
25-
GITHUB_REF= dagger -s call -m github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}
26-
with-linter-cache --cache golangci-lint
27-
with-build-cache --cache go-build
28-
with-module-cache --cache go-mod
29-
run --source . --config .golangci.yml stdout
27+
GITHUB_REF= dagger -sc "github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}
28+
--go-version ${GOLANG_IMAGE_VERSION} |
29+
run . --config .golangci.yml |
30+
stdout"
3031
sources:
3132
- ./**/*.go
3233

@@ -70,7 +71,7 @@ tasks:
7071
desc: Run go test
7172
env:
7273
# renovate: datasource=docker depName=golang versioning=semver
73-
GOLANG_IMAGE_VERSION: 1.23.5
74+
GOLANG_IMAGE_VERSION: 1.25.5
7475
# renovate: datasource=git-refs depname=kubernetes packageName=https://github.com/kubernetes/kubernetes versioning=semver
7576
K8S_VERSION: 1.31.0
7677
# renovate: datasource=git-refs depName=controller-runtime packageName=https://github.com/kubernetes-sigs/controller-runtime versioning=semver
@@ -147,7 +148,7 @@ tasks:
147148
- start-build-network
148149
vars:
149150
# renovate: datasource=github-tags depName=dagger/dagger versioning=semver
150-
DAGGER_VERSION: 0.18.5
151+
DAGGER_VERSION: 0.19.8
151152
DAGGER_ENGINE_IMAGE: registry.dagger.io/engine:v{{ .DAGGER_VERSION }}
152153
cmds:
153154
- >
@@ -246,7 +247,7 @@ tasks:
246247
- start-kind-cluster
247248
vars:
248249
# renovate: datasource=docker depName=golang versioning=semver
249-
GOLANG_IMAGE_VERSION: 1.23.5
250+
GOLANG_IMAGE_VERSION: 1.25.5
250251
KUBECONFIG_PATH:
251252
sh: mktemp -t kubeconfig-XXXXX
252253
env:
@@ -265,7 +266,7 @@ tasks:
265266
- build-images
266267
vars:
267268
# renovate: datasource=docker depName=golang versioning=semver
268-
GOLANG_IMAGE_VERSION: 1.23.5
269+
GOLANG_IMAGE_VERSION: 1.25.5
269270
# renovate: datasource=docker depName=k3s versioning=semver
270271
K3S_IMAGE_VERSION: 1.33.1
271272
env:
@@ -327,7 +328,7 @@ tasks:
327328
desc: Run controller-gen
328329
env:
329330
# renovate: datasource=git-refs depName=controller-gen lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
330-
DAGGER_CONTROLLER_GEN_SHA: 9151fdb403298e305889668706b6cd69bb287e88
331+
DAGGER_CONTROLLER_GEN_SHA: ee59e34a99940e45f87a16177b1d640975b05b74
331332
cmds:
332333
- >
333334
GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/controller-gen@${DAGGER_CONTROLLER_GEN_SHA}

‎config/crd/bases/pgbackrest.cnpg.opera.com_archives.yaml‎

Lines changed: 42 additions & 4 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.16.2
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: archives.pgbackrest.cnpg.opera.com
88
spec:
99
group: pgbackrest.cnpg.opera.com
@@ -385,8 +385,9 @@ spec:
385385
in a Container.
386386
properties:
387387
name:
388-
description: Name of the environment variable. Must be a
389-
C_IDENTIFIER.
388+
description: |-
389+
Name of the environment variable.
390+
May consist of any printable ASCII characters except '='.
390391
type: string
391392
value:
392393
description: |-
@@ -444,6 +445,43 @@ spec:
444445
- fieldPath
445446
type: object
446447
x-kubernetes-map-type: atomic
448+
fileKeyRef:
449+
description: |-
450+
FileKeyRef selects a key of the env file.
451+
Requires the EnvFiles feature gate to be enabled.
452+
properties:
453+
key:
454+
description: |-
455+
The key within the env file. An invalid key will prevent the pod from starting.
456+
The keys defined within a source may consist of any printable ASCII characters except '='.
457+
During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
458+
type: string
459+
optional:
460+
default: false
461+
description: |-
462+
Specify whether the file or its key must be defined. If the file or key
463+
does not exist, then the env var is not published.
464+
If optional is set to true and the specified key does not exist,
465+
the environment variable will not be set in the Pod's containers.
466+
467+
If optional is set to false and the specified key does not exist,
468+
an error will be returned during Pod creation.
469+
type: boolean
470+
path:
471+
description: |-
472+
The path within the volume from which to select the file.
473+
Must be relative and may not contain the '..' path or start with '..'.
474+
type: string
475+
volumeName:
476+
description: The name of the volume mount containing
477+
the env file.
478+
type: string
479+
required:
480+
- key
481+
- path
482+
- volumeName
483+
type: object
484+
x-kubernetes-map-type: atomic
447485
resourceFieldRef:
448486
description: |-
449487
Selects a resource of the container: only resources limits and requests
@@ -506,7 +544,7 @@ spec:
506544
Claims lists the names of resources, defined in spec.resourceClaims,
507545
that are used by this container.
508546
509-
This is an alpha field and requires enabling the
547+
This field depends on the
510548
DynamicResourceAllocation feature gate.
511549
512550
This field is immutable. It can only be set for containers.

‎containers/Dockerfile.plugin‎

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.23.5 AS gobuilder
2+
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS gobuilder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎containers/Dockerfile.sidecar‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Pgbackrest is taken from the package available in the official Postgres repo.
77

88
# Build the manager binary
9-
FROM --platform=$BUILDPLATFORM golang:1.23.5 AS gobuilder
9+
FROM --platform=$BUILDPLATFORM golang:1.25.5 AS gobuilder
1010
ARG TARGETOS
1111
ARG TARGETARCH
1212

‎dagger/e2e/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/internal/dagger
33
/internal/querybuilder
44
/internal/telemetry
5+
/.env

‎dagger/e2e/dagger.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "e2e",
3-
"engineVersion": "v0.18.5",
3+
"engineVersion": "v0.19.8",
44
"sdk": {
55
"source": "go"
66
},
@@ -12,8 +12,9 @@
1212
},
1313
{
1414
"name": "k3s",
15-
"source": "github.com/marcosnils/daggerverse/k3s@k3s/v0.1.10",
16-
"pin": "28eea1fcf3b6ecb38a628186107760acd717442f"
15+
"source": "github.com/marcosnils/daggerverse/k3s@k3s/v0.11.0",
16+
"pin": "2bdcdc63376e82e395f415454a07fcc5a0d3e518"
1717
}
18-
]
18+
],
19+
"disableDefaultFunctionCaching": true
1920
}

‎dagger/e2e/go.mod‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
11
module dagger/e-2-e
22

3-
go 1.23.2
3+
go 1.25.5
44

55
require (
6-
github.com/99designs/gqlgen v0.17.73
7-
github.com/Khan/genqlient v0.8.0
8-
github.com/vektah/gqlparser/v2 v2.5.26
9-
go.opentelemetry.io/otel v1.34.0
10-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0
11-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0
12-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0
13-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0
14-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
15-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0
16-
go.opentelemetry.io/otel/log v0.8.0
17-
go.opentelemetry.io/otel/metric v1.34.0
18-
go.opentelemetry.io/otel/sdk v1.34.0
19-
go.opentelemetry.io/otel/sdk/log v0.8.0
20-
go.opentelemetry.io/otel/sdk/metric v1.34.0
21-
go.opentelemetry.io/otel/trace v1.34.0
22-
go.opentelemetry.io/proto/otlp v1.3.1
23-
golang.org/x/sync v0.13.0
24-
google.golang.org/grpc v1.72.0
6+
github.com/99designs/gqlgen v0.17.84
7+
github.com/Khan/genqlient v0.8.1
8+
github.com/vektah/gqlparser/v2 v2.5.31
9+
go.opentelemetry.io/otel v1.39.0
10+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.15.0
11+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0
12+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.39.0
13+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0
14+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0
15+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0
16+
go.opentelemetry.io/otel/log v0.15.0
17+
go.opentelemetry.io/otel/metric v1.39.0
18+
go.opentelemetry.io/otel/sdk v1.39.0
19+
go.opentelemetry.io/otel/sdk/log v0.15.0
20+
go.opentelemetry.io/otel/sdk/metric v1.39.0
21+
go.opentelemetry.io/otel/trace v1.39.0
22+
go.opentelemetry.io/proto/otlp v1.9.0
23+
golang.org/x/sync v0.19.0
24+
google.golang.org/grpc v1.77.0
2525
)
2626

2727
require (
28-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29-
github.com/go-logr/logr v1.4.2 // indirect
28+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
29+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
30+
github.com/go-logr/logr v1.4.3 // indirect
3031
github.com/go-logr/stdr v1.2.2 // indirect
3132
github.com/google/uuid v1.6.0 // indirect
32-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
33+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
3334
github.com/sosodev/duration v1.3.1 // indirect
34-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
35-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
36-
golang.org/x/net v0.39.0 // indirect
37-
golang.org/x/sys v0.32.0 // indirect
38-
golang.org/x/text v0.24.0 // indirect
39-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
40-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
41-
google.golang.org/protobuf v1.36.6 // indirect
35+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
36+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
37+
golang.org/x/net v0.48.0 // indirect
38+
golang.org/x/sys v0.39.0 // indirect
39+
golang.org/x/text v0.32.0 // indirect
40+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
41+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
42+
google.golang.org/protobuf v1.36.11 // indirect
4243
)
4344

44-
replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0
45+
replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0
4546

46-
replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0
47+
replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0
4748

48-
replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.8.0
49+
replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.14.0
4950

50-
replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.8.0
51+
replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.14.0

0 commit comments

Comments
 (0)