Skip to content

Commit e3ae62f

Browse files
authored
Merge branch 'main' into ephemeral-clusters
Signed-off-by: Leonardo Cecchi <[email protected]>
2 parents ae669ad + 517c532 commit e3ae62f

File tree

7 files changed

+94
-43
lines changed

7 files changed

+94
-43
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ kubectl get deployment -n cnpg-system cnpg-controller-manager \
8181
Example output:
8282

8383
```output
84-
image: ghcr.io/cloudnative-pg/cloudnative-pg:1.25.0-rc1
84+
image: ghcr.io/cloudnative-pg/cloudnative-pg:1.25.0
8585
```
8686

8787
Ensure that the version displayed is **1.25** or newer.
8888

89-
Then, use the [cmctl](https://cert-manager.io/v1.6-docs/usage/cmctl/#installation)
89+
Then, use the [cmctl](https://cert-manager.io/docs/reference/cmctl/#installation)
9090
tool to confirm that `cert-manager` is correctly installed:
9191

9292
```sh

Taskfile.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tasks:
3434
desc: Run spellcheck
3535
env:
3636
# renovate: datasource=git-refs depName=spellcheck lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
37-
DAGGER_SPELLCHECK_SHA: f2acc8d99c16422193b59859048ecca98ffb9334
37+
DAGGER_SPELLCHECK_SHA: b8e24f5ad3e7da6dce9f6f9edd93baf165f3106a
3838
cmds:
3939
- >
4040
GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/spellcheck@${DAGGER_SPELLCHECK_SHA}
@@ -48,7 +48,7 @@ tasks:
4848
desc: Check for conventional commits
4949
env:
5050
# renovate: datasource=git-refs depName=commitlint lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
51-
DAGGER_COMMITLINT_SHA: f2acc8d99c16422193b59859048ecca98ffb9334
51+
DAGGER_COMMITLINT_SHA: b8e24f5ad3e7da6dce9f6f9edd93baf165f3106a
5252
cmds:
5353
- >
5454
GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/commitlint@${DAGGER_COMMITLINT_SHA}
@@ -60,7 +60,7 @@ tasks:
6060
- manifest-main
6161
env:
6262
# renovate: datasource=git-refs depName=uncommitted lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
63-
DAGGER_UNCOMMITTED_SHA: f2acc8d99c16422193b59859048ecca98ffb9334
63+
DAGGER_UNCOMMITTED_SHA: b8e24f5ad3e7da6dce9f6f9edd93baf165f3106a
6464
cmds:
6565
- GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/uncommitted@${DAGGER_UNCOMMITTED_SHA} check-uncommitted --source . stdout
6666
sources:
@@ -167,7 +167,7 @@ tasks:
167167
- start-dagger-engine-for-local-builds
168168
env:
169169
# renovate: datasource=git-refs depName=docker lookupName=https://github.com/purpleclay/daggerverse currentValue=main
170-
DAGGER_DOCKER_SHA: 14c1374e5878f082939aab575c36cdad19920e0d
170+
DAGGER_DOCKER_SHA: 1379b455587e74072cee73db1b78e11af4215d53
171171
_EXPERIMENTAL_DAGGER_RUNNER_HOST: docker-container://{{ .DAGGER_ENGINE_CONTAINER_NAME }}
172172
cmds:
173173
- >
@@ -184,7 +184,7 @@ tasks:
184184
- start-dagger-engine-for-local-builds
185185
env:
186186
# renovate: datasource=git-refs depName=docker lookupName=https://github.com/purpleclay/daggerverse currentValue=main
187-
DAGGER_DOCKER_SHA: 14c1374e5878f082939aab575c36cdad19920e0d
187+
DAGGER_DOCKER_SHA: 1379b455587e74072cee73db1b78e11af4215d53
188188
_EXPERIMENTAL_DAGGER_RUNNER_HOST: docker-container://{{ .DAGGER_ENGINE_CONTAINER_NAME }}
189189
cmds:
190190
- >
@@ -306,7 +306,7 @@ tasks:
306306
IMAGE_VERSION: '{{regexReplaceAll "(\\d+)/merge" .GITHUB_REF_NAME "pr-${1}"}}'
307307
env:
308308
# renovate: datasource=git-refs depName=docker lookupName=https://github.com/purpleclay/daggerverse currentValue=main
309-
DAGGER_DOCKER_SHA: 14c1374e5878f082939aab575c36cdad19920e0d
309+
DAGGER_DOCKER_SHA: 1379b455587e74072cee73db1b78e11af4215d53
310310
cmds:
311311
- >
312312
dagger call -m github.com/purpleclay/daggerverse/docker@${DAGGER_DOCKER_SHA}
@@ -324,7 +324,7 @@ tasks:
324324
desc: Run controller-gen
325325
env:
326326
# renovate: datasource=git-refs depName=controller-gen lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
327-
DAGGER_CONTROLLER_GEN_SHA: f2acc8d99c16422193b59859048ecca98ffb9334
327+
DAGGER_CONTROLLER_GEN_SHA: b8e24f5ad3e7da6dce9f6f9edd93baf165f3106a
328328
cmds:
329329
- >
330330
GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/controller-gen@${DAGGER_CONTROLLER_GEN_SHA}
@@ -420,7 +420,7 @@ tasks:
420420
- GITHUB_TOKEN
421421
env:
422422
# renovate: datasource=git-refs depName=gh lookupName=https://github.com/sagikazarmark/daggerverse
423-
DAGGER_GH_SHA: 8759a527c3f97b02b942fcb87b6aadb442f61d43
423+
DAGGER_GH_SHA: c1be27189ce47d28f84014b715f78e47db9fbadc
424424
preconditions:
425425
- sh: "[[ {{.GITHUB_REF}} =~ 'refs/tags/v.*' ]]"
426426
msg: not a tag, failing

go.mod

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
module github.com/cloudnative-pg/plugin-barman-cloud
22

3-
go 1.23
3+
go 1.23.0
44

55
toolchain go1.23.4
66

77
require (
88
github.com/cert-manager/cert-manager v1.16.2
9-
github.com/cloudnative-pg/api v0.0.0-20241209133608-a48d55a7861d
10-
github.com/cloudnative-pg/barman-cloud v0.0.0-20241206153842-9d56b349a329
9+
github.com/cloudnative-pg/api v1.25.0
10+
github.com/cloudnative-pg/barman-cloud v0.0.0-20241218093921-134c7de4954a
1111
github.com/cloudnative-pg/cloudnative-pg v1.25.0-rc1.0.20241211133237-da2d0341a4a4
1212
github.com/cloudnative-pg/cnpg-i v0.0.0-20241211164119-6252971211f2
1313
github.com/cloudnative-pg/cnpg-i-machinery v0.0.0-20241209132929-8e699460292f
14-
github.com/cloudnative-pg/machinery v0.0.0-20241209124314-8e260445e987
14+
github.com/cloudnative-pg/machinery v0.0.0-20241219102532-2807bc88310d
1515
github.com/docker/docker v27.4.0+incompatible
16-
github.com/onsi/ginkgo/v2 v2.22.0
16+
github.com/onsi/ginkgo/v2 v2.22.1
1717
github.com/onsi/gomega v1.36.1
1818
github.com/spf13/cobra v1.8.1
1919
github.com/spf13/viper v1.19.0
2020
google.golang.org/grpc v1.68.1
2121
gopkg.in/yaml.v3 v3.0.1
22-
k8s.io/api v0.31.3
23-
k8s.io/apiextensions-apiserver v0.31.3
24-
k8s.io/apimachinery v0.31.3
25-
k8s.io/client-go v0.31.3
22+
k8s.io/api v0.32.0
23+
k8s.io/apiextensions-apiserver v0.32.0
24+
k8s.io/apimachinery v0.32.0
25+
k8s.io/client-go v0.32.0
2626
k8s.io/utils v0.0.0-20241210054802-24370beab758
2727
sigs.k8s.io/controller-runtime v0.19.3
2828
sigs.k8s.io/kind v0.25.0
@@ -31,6 +31,7 @@ require (
3131
)
3232

3333
require (
34+
cel.dev/expr v0.18.0 // indirect
3435
github.com/BurntSushi/toml v1.4.0 // indirect
3536
github.com/Microsoft/go-winio v0.4.14 // indirect
3637
github.com/alessio/shellescape v1.4.2 // indirect
@@ -62,11 +63,11 @@ require (
6263
github.com/gogo/protobuf v1.3.2 // indirect
6364
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6465
github.com/golang/protobuf v1.5.4 // indirect
65-
github.com/google/cel-go v0.20.1 // indirect
66+
github.com/google/cel-go v0.22.0 // indirect
6667
github.com/google/gnostic-models v0.6.8 // indirect
6768
github.com/google/go-cmp v0.6.0 // indirect
6869
github.com/google/gofuzz v1.2.0 // indirect
69-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
70+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
7071
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
7172
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7273
github.com/google/uuid v1.6.0 // indirect
@@ -86,7 +87,7 @@ require (
8687
github.com/mattn/go-isatty v0.0.20 // indirect
8788
github.com/mitchellh/mapstructure v1.5.0 // indirect
8889
github.com/moby/docker-image-spec v1.3.1 // indirect
89-
github.com/moby/spdystream v0.4.0 // indirect
90+
github.com/moby/spdystream v0.5.0 // indirect
9091
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9192
github.com/modern-go/reflect2 v1.0.2 // indirect
9293
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -98,7 +99,7 @@ require (
9899
github.com/pelletier/go-toml v1.9.5 // indirect
99100
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
100101
github.com/pkg/errors v0.9.1 // indirect
101-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 // indirect
102+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2 // indirect
102103
github.com/prometheus/client_golang v1.20.5 // indirect
103104
github.com/prometheus/client_model v0.6.1 // indirect
104105
github.com/prometheus/common v0.59.1 // indirect
@@ -128,14 +129,14 @@ require (
128129
go.uber.org/multierr v1.11.0 // indirect
129130
go.uber.org/zap v1.27.0 // indirect
130131
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
131-
golang.org/x/net v0.30.0 // indirect
132+
golang.org/x/net v0.32.0 // indirect
132133
golang.org/x/oauth2 v0.23.0 // indirect
133-
golang.org/x/sync v0.9.0 // indirect
134-
golang.org/x/sys v0.27.0 // indirect
135-
golang.org/x/term v0.26.0 // indirect
136-
golang.org/x/text v0.20.0 // indirect
134+
golang.org/x/sync v0.10.0 // indirect
135+
golang.org/x/sys v0.28.0 // indirect
136+
golang.org/x/term v0.27.0 // indirect
137+
golang.org/x/text v0.21.0 // indirect
137138
golang.org/x/time v0.7.0 // indirect
138-
golang.org/x/tools v0.26.0 // indirect
139+
golang.org/x/tools v0.28.0 // indirect
139140
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
140141
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
141142
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
@@ -145,13 +146,13 @@ require (
145146
gopkg.in/ini.v1 v1.67.0 // indirect
146147
gopkg.in/yaml.v2 v2.4.0 // indirect
147148
gotest.tools/v3 v3.5.1 // indirect
148-
k8s.io/apiserver v0.31.3 // indirect
149-
k8s.io/component-base v0.31.3 // indirect
149+
k8s.io/apiserver v0.32.0 // indirect
150+
k8s.io/component-base v0.32.0 // indirect
150151
k8s.io/klog/v2 v2.130.1 // indirect
151-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
152-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
152+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
153+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
153154
sigs.k8s.io/gateway-api v1.1.0 // indirect
154-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
155-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
155+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
156+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
156157
sigs.k8s.io/yaml v1.4.0 // indirect
157158
)

0 commit comments

Comments
 (0)