Skip to content

Commit 833b347

Browse files
committed
fix: use digest for CNPG main repo
Signed-off-by: Marco Nenciarini <[email protected]>
1 parent 3456927 commit 833b347

File tree

3 files changed

+34
-37
lines changed

3 files changed

+34
-37
lines changed

go.mod

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

3-
go 1.23.0
3+
go 1.23.5
44

5-
toolchain go1.23.5
5+
toolchain go1.24.0
66

77
require (
88
github.com/cert-manager/cert-manager v1.17.1
99
github.com/cloudnative-pg/api v1.25.0
1010
github.com/cloudnative-pg/barman-cloud v0.1.0
11-
github.com/cloudnative-pg/cloudnative-pg v1.25.0
11+
github.com/cloudnative-pg/cloudnative-pg v1.25.1-0.20250226125831-6e46e6c9eed9
1212
github.com/cloudnative-pg/cnpg-i v0.1.0
1313
github.com/cloudnative-pg/cnpg-i-machinery v0.1.0
1414
github.com/cloudnative-pg/machinery v0.1.0
@@ -19,9 +19,9 @@ require (
1919
google.golang.org/grpc v1.70.0
2020
gopkg.in/yaml.v3 v3.0.1
2121
k8s.io/api v0.32.2
22-
k8s.io/apiextensions-apiserver v0.32.1
22+
k8s.io/apiextensions-apiserver v0.32.2
2323
k8s.io/apimachinery v0.32.2
24-
k8s.io/client-go v0.32.1
24+
k8s.io/client-go v0.32.2
2525
k8s.io/utils v0.0.0-20241210054802-24370beab758
2626
sigs.k8s.io/controller-runtime v0.20.2
2727
sigs.k8s.io/kustomize/api v0.19.0
@@ -82,12 +82,11 @@ require (
8282
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8383
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
8484
github.com/pkg/errors v0.9.1 // indirect
85-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2 // indirect
86-
github.com/prometheus/client_golang v1.20.5 // indirect
85+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 // indirect
86+
github.com/prometheus/client_golang v1.21.0 // indirect
8787
github.com/prometheus/client_model v0.6.1 // indirect
88-
github.com/prometheus/common v0.61.0 // indirect
88+
github.com/prometheus/common v0.62.0 // indirect
8989
github.com/prometheus/procfs v0.15.1 // indirect
90-
github.com/robfig/cron v1.2.0 // indirect
9190
github.com/sagikazarmark/locafero v0.4.0 // indirect
9291
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
9392
github.com/snorwin/jsonpatch v1.5.0 // indirect
@@ -113,12 +112,12 @@ require (
113112
go.uber.org/zap v1.27.0 // indirect
114113
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
115114
golang.org/x/net v0.35.0 // indirect
116-
golang.org/x/oauth2 v0.24.0 // indirect
115+
golang.org/x/oauth2 v0.25.0 // indirect
117116
golang.org/x/sync v0.11.0 // indirect
118117
golang.org/x/sys v0.30.0 // indirect
119118
golang.org/x/term v0.29.0 // indirect
120119
golang.org/x/text v0.22.0 // indirect
121-
golang.org/x/time v0.8.0 // indirect
120+
golang.org/x/time v0.9.0 // indirect
122121
golang.org/x/tools v0.28.0 // indirect
123122
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
124123
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
@@ -127,8 +126,8 @@ require (
127126
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
128127
gopkg.in/inf.v0 v0.9.1 // indirect
129128
gopkg.in/ini.v1 v1.67.0 // indirect
130-
k8s.io/apiserver v0.32.1 // indirect
131-
k8s.io/component-base v0.32.1 // indirect
129+
k8s.io/apiserver v0.32.2 // indirect
130+
k8s.io/component-base v0.32.2 // indirect
132131
k8s.io/klog/v2 v2.130.1 // indirect
133132
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
134133
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect

go.sum

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ github.com/cloudnative-pg/api v1.25.0 h1:jLrHUq9Ye52+YC9I0Cj4VAFdmaKCLKmUrF9zxgb
2222
github.com/cloudnative-pg/api v1.25.0/go.mod h1:49gdjFO7/fcZWjO/Ohh8DPO7UN6oivRDpN3vgulZohY=
2323
github.com/cloudnative-pg/barman-cloud v0.1.0 h1:e/z52CehMBIh1LjZqNBJnncWJbS+1JYvRMBR8Js6Uiw=
2424
github.com/cloudnative-pg/barman-cloud v0.1.0/go.mod h1:rJUJO/f1yNckLZiVxHAyRmKY+4EPJkYRJsGbTZRJQSY=
25-
github.com/cloudnative-pg/cloudnative-pg v1.25.0 h1:VWqj9Hfme4rIdTZm9/SLQN97WMTXPMvZRqEs2n3tIec=
26-
github.com/cloudnative-pg/cloudnative-pg v1.25.0/go.mod h1:f+KfcxV2nam1S6oEMZruVBj340pWQrqrhLQVvzbtpdA=
25+
github.com/cloudnative-pg/cloudnative-pg v1.25.1-0.20250226125831-6e46e6c9eed9 h1:rivE04YdEO3hj/W21suM7oqTlOXQ1fWvXvvdDKUsJJc=
26+
github.com/cloudnative-pg/cloudnative-pg v1.25.1-0.20250226125831-6e46e6c9eed9/go.mod h1:jX8X3A/hy4pscR0CvCHk9m/u/Zyly8kNwX8jyEZsNhQ=
2727
github.com/cloudnative-pg/cnpg-i v0.1.0 h1:QH2xTsrODMhEEc6B25GbOYe7ZIttDmSkYvXotfU5dfs=
2828
github.com/cloudnative-pg/cnpg-i v0.1.0/go.mod h1:G28BhgUEHqrxEyyQeHz8BbpMVAsGuLhJm/tHUbDi8Sw=
2929
github.com/cloudnative-pg/cnpg-i-machinery v0.1.0 h1:Z3P7DwN7EqLDgAozGQHzSgLYn6uyW65/5aPiSREsHJg=
@@ -148,18 +148,16 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
148148
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
149149
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
150150
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
151-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2 h1:DGv150w4UyxnjNHlkCw85R3+lspOxegtdnbpP2vKRrk=
152-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2/go.mod h1:AVMP4QEW8xuGWnxaWSpI3kKjP9fDA31nO68zsyREJZA=
153-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
154-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
151+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 h1:DP+PUNVOc+Bkft8a4QunLzaZ0RspWuD3tBbcPHr2PeE=
152+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1/go.mod h1:6x4x0t9BP35g4XcjkHE9EB3RxhyfxpdpmZKd/Qyk8+M=
153+
github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
154+
github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
155155
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
156156
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
157-
github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
158-
github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
157+
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
158+
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
159159
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
160160
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
161-
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
162-
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
163161
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
164162
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
165163
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -249,8 +247,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
249247
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
250248
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
251249
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
252-
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
253-
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
250+
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
251+
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
254252
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
255253
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
256254
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -267,8 +265,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
267265
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
268266
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
269267
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
270-
golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
271-
golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
268+
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
269+
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
272270
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
273271
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
274272
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -304,16 +302,16 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
304302
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
305303
k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw=
306304
k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y=
307-
k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw=
308-
k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto=
305+
k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4=
306+
k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA=
309307
k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ=
310308
k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
311-
k8s.io/apiserver v0.32.1 h1:oo0OozRos66WFq87Zc5tclUX2r0mymoVHRq8JmR7Aak=
312-
k8s.io/apiserver v0.32.1/go.mod h1:UcB9tWjBY7aryeI5zAgzVJB/6k7E97bkr1RgqDz0jPw=
313-
k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU=
314-
k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg=
315-
k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk=
316-
k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w=
309+
k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw=
310+
k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM=
311+
k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA=
312+
k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94=
313+
k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU=
314+
k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0=
317315
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
318316
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
319317
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=

internal/cnpgi/operator/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func (config *PluginConfiguration) GetReferredBarmanObjectsKey() []types.Namespa
103103

104104
func getClusterGVK() schema.GroupVersionKind {
105105
return schema.GroupVersionKind{
106-
Group: cnpgv1.GroupVersion.Group,
107-
Version: cnpgv1.GroupVersion.Version,
106+
Group: cnpgv1.SchemeGroupVersion.Group,
107+
Version: cnpgv1.SchemeGroupVersion.Version,
108108
Kind: cnpgv1.ClusterKind,
109109
}
110110
}

0 commit comments

Comments
 (0)