File tree Expand file tree Collapse file tree 4 files changed +12
-4
lines changed
Expand file tree Collapse file tree 4 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -155,3 +155,5 @@ require (
155155 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
156156 sigs.k8s.io/yaml v1.4.0 // indirect
157157)
158+
159+ replace github.com/cloudnative-pg/barman-cloud => github.com/fcanovai/barman-cloud v0.0.0-20241122154151-236fde9667ac
Original file line number Diff line number Diff line change @@ -26,8 +26,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
2626github.com/cespare/xxhash/v2 v2.3.0 /go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs =
2727github.com/cloudnative-pg/api v0.0.0-20241116094849-219d7a1d257f h1:KAXst7XLaipdFk9Qv796+tThfEJwFMG4wPLAizZ7wx4 =
2828github.com/cloudnative-pg/api v0.0.0-20241116094849-219d7a1d257f /go.mod h1:aYVZDHteiejVYbntDxJVx1K45xeV8y0KtR/wK4zvt7U =
29- github.com/cloudnative-pg/barman-cloud v0.0.0-20241105055149-ae6c2408bd14 h1:HX5pXyzVAqfjcDgCa1l8b4sumf7XYnGqiP+6XMgbB2E =
30- github.com/cloudnative-pg/barman-cloud v0.0.0-20241105055149-ae6c2408bd14 /go.mod h1:HPGwXHlatQEnb2HdsbGTZLEo8qlxKLdxTHiTeF9TTqw =
3129github.com/cloudnative-pg/cloudnative-pg v1.24.1-0.20241113134512-8608232c2813 h1:XWpr5y28JRwcA4BzxBkHFx7C8JDqOSdDIN7RbRdI6Dg =
3230github.com/cloudnative-pg/cloudnative-pg v1.24.1-0.20241113134512-8608232c2813 /go.mod h1:f4hObdRVoQtMmVtWqZ6VDZBrI6ok9Td/UMhojQ+EPmk =
3331github.com/cloudnative-pg/cnpg-i v0.0.0-20241109002750-8abd359df734 h1:4jq/FUrlAKxu0Kw9PL5lj5Njq8pAnmUpP/kXKOrJAaE =
@@ -57,6 +55,8 @@ github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lSh
5755github.com/evanphx/json-patch v5.9.0+incompatible /go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk =
5856github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg =
5957github.com/evanphx/json-patch/v5 v5.9.0 /go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ =
58+ github.com/fcanovai/barman-cloud v0.0.0-20241122154151-236fde9667ac h1:f5voU+ukASKVRLd8/K/SazUWG378LMQrnuyf5DO9beo =
59+ github.com/fcanovai/barman-cloud v0.0.0-20241122154151-236fde9667ac /go.mod h1:HPGwXHlatQEnb2HdsbGTZLEo8qlxKLdxTHiTeF9TTqw =
6060github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg =
6161github.com/felixge/httpsnoop v1.0.4 /go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U =
6262github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8 =
Original file line number Diff line number Diff line change @@ -51,7 +51,10 @@ var _ = SynchronizedBeforeSuite(func(ctx SpecContext) []byte {
5151 var cl client.Client
5252 var err error
5353 if cl , err = e2etestenv .Setup (ctx ,
54- e2etestenv .WithKindAdditionalNetworks ([]string {"barman-cloud-plugin" })); err != nil {
54+ e2etestenv .WithKindAdditionalNetworks ([]string {"barman-cloud-plugin" }),
55+ // TODO: remove this when https://github.com/cloudnative-pg/barman-cloud/pull/47 is merged
56+ e2etestenv .WithCNPGImageName ("ghcr.io/fcanovai/cloudnative-pg-testing:main" ),
57+ ); err != nil {
5558 Fail (fmt .Sprintf ("failed to setup environment: %v" , err ))
5659 }
5760
Original file line number Diff line number Diff line change @@ -68,7 +68,10 @@ func newGCSDeployment(namespace, name string) *appsv1.Deployment {
6868 {
6969 Name : name ,
7070 // TODO: renovate the image
71- Image : "registry.barman-cloud-plugin:5000/fakegcs:test" ,
71+ // FIXME: move to the official fsouza/fake-gcs-server
72+ // when https://github.com/fsouza/fake-gcs-server/pull/1827
73+ // is merged and released.
74+ Image : "ghcr.io/fcanovai/fake-gcs-server:latest" ,
7275 Ports : []corev1.ContainerPort {
7376 {
7477 ContainerPort : 4443 ,
You can’t perform that action at this time.
0 commit comments