Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.

Commit 5245d42

Browse files
leonardocearmrumnencia
authored
feat: use cnpg-i machinery (#8)
Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com> Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com> Co-authored-by: Armando Ruocco <armando.ruocco@enterprisedb.com> Co-authored-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
1 parent fb21225 commit 5245d42

16 files changed

Lines changed: 23 additions & 519 deletions

File tree

‎go.mod‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@ toolchain go1.21.6
77
require (
88
github.com/cloudnative-pg/cloudnative-pg v1.22.1-0.20240123130737-a22a155b9eb8
99
github.com/cloudnative-pg/cnpg-i v0.0.0-20240202130713-14050b29b7a2
10-
github.com/evanphx/json-patch/v5 v5.8.1
11-
github.com/go-logr/logr v1.3.0
12-
github.com/go-logr/zapr v1.2.4
13-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
14-
github.com/spf13/cobra v1.8.0
15-
github.com/spf13/viper v1.14.0
16-
go.uber.org/zap v1.26.0
10+
github.com/cloudnative-pg/cnpg-i-machinery v0.0.0-20240215100236-082604edc33a
1711
google.golang.org/grpc v1.60.1
1812
k8s.io/api v0.28.4
1913
k8s.io/apimachinery v0.28.4
@@ -26,7 +20,10 @@ require (
2620
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2721
github.com/davecgh/go-spew v1.1.1 // indirect
2822
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
23+
github.com/evanphx/json-patch/v5 v5.8.1 // indirect
2924
github.com/fsnotify/fsnotify v1.6.0 // indirect
25+
github.com/go-logr/logr v1.3.0 // indirect
26+
github.com/go-logr/zapr v1.2.4 // indirect
3027
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3128
github.com/go-openapi/jsonreference v0.20.2 // indirect
3229
github.com/go-openapi/swag v0.22.3 // indirect
@@ -38,6 +35,7 @@ require (
3835
github.com/google/gofuzz v1.2.0 // indirect
3936
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
4037
github.com/google/uuid v1.5.0 // indirect
38+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect
4139
github.com/hashicorp/hcl v1.0.0 // indirect
4240
github.com/imdario/mergo v0.3.12 // indirect
4341
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -70,11 +68,14 @@ require (
7068
github.com/robfig/cron v1.2.0 // indirect
7169
github.com/spf13/afero v1.9.2 // indirect
7270
github.com/spf13/cast v1.5.0 // indirect
71+
github.com/spf13/cobra v1.8.0 // indirect
7372
github.com/spf13/jwalterweatherman v1.1.0 // indirect
7473
github.com/spf13/pflag v1.0.5 // indirect
74+
github.com/spf13/viper v1.14.0 // indirect
7575
github.com/subosito/gotenv v1.4.1 // indirect
7676
go.uber.org/atomic v1.11.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
78+
go.uber.org/zap v1.26.0 // indirect
7879
golang.org/x/crypto v0.18.0 // indirect
7980
golang.org/x/exp v0.0.0-20231219160207-73b9e39aefca // indirect
8081
golang.org/x/net v0.20.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ github.com/cloudnative-pg/cloudnative-pg v1.22.1-0.20240123130737-a22a155b9eb8 h
5858
github.com/cloudnative-pg/cloudnative-pg v1.22.1-0.20240123130737-a22a155b9eb8/go.mod h1:r6blheO2ihiuqKbk6rqPN5//PPJnYtKCGT2OxpXtk2o=
5959
github.com/cloudnative-pg/cnpg-i v0.0.0-20240202130713-14050b29b7a2 h1:7Cow1BF5rM3k7q+QYjJsPiYGZTK8w+uTGa4VZ3IbBpk=
6060
github.com/cloudnative-pg/cnpg-i v0.0.0-20240202130713-14050b29b7a2/go.mod h1:0G5GXQVj09KvONIcYURyroL74zOFGjv4eI5OXz7/G/0=
61+
github.com/cloudnative-pg/cnpg-i-machinery v0.0.0-20240215100236-082604edc33a h1:ccAuhOYdWRuPXNDOq4OuLOInfJAKPTvxmVd/FINiET4=
62+
github.com/cloudnative-pg/cnpg-i-machinery v0.0.0-20240215100236-082604edc33a/go.mod h1:A2Zx68zGuz6N/mv/1Jxgn9D6fV9Uc+wA58knRrEHwfo=
6163
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
6264
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
6365
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

‎internal/backup/backup.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"context"
55
"time"
66

7+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/logging"
8+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/pluginhelper"
79
"github.com/cloudnative-pg/cnpg-i/pkg/backup"
810

911
"github.com/cloudnative-pg/plugin-pvc-backup/internal/backup/executor"
1012
"github.com/cloudnative-pg/plugin-pvc-backup/internal/backup/storage"
11-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/logging"
1213
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/metadata"
13-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/pluginhelper"
1414
)
1515

1616
// Implementation is the implementation of the identity service

‎internal/backup/executor/controldata.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import (
1111

1212
"github.com/cloudnative-pg/cloudnative-pg/pkg/management/url"
1313
"github.com/cloudnative-pg/cloudnative-pg/pkg/utils"
14-
15-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/logging"
14+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/logging"
1615
)
1716

1817
// getPgControlData obtains the pg_controldata from the instance HTTP endpoint

‎internal/backup/executor/executor.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ import (
1010

1111
apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
1212
"github.com/cloudnative-pg/cloudnative-pg/pkg/management/postgres/webserver"
13+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/logging"
1314
"k8s.io/apimachinery/pkg/util/wait"
1415
"k8s.io/client-go/util/retry"
15-
16-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/logging"
1716
)
1817

1918
var (

‎internal/backup/executor/repository.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import (
66
"os/exec"
77
"path"
88

9+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/logging"
10+
911
"github.com/cloudnative-pg/plugin-pvc-backup/internal/fileutils"
10-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/logging"
1112
)
1213

1314
const (

‎internal/operator/mutations.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package operator
1919
import (
2020
"context"
2121

22+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/pluginhelper"
2223
"github.com/cloudnative-pg/cnpg-i/pkg/operator"
2324
corev1 "k8s.io/api/core/v1"
2425

2526
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/metadata"
26-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/pluginhelper"
2727
)
2828

2929
// MutateCluster is called to mutate a cluster with the defaulting webhook.

‎internal/operator/validation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"context"
2121
"fmt"
2222

23+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/pluginhelper"
2324
"github.com/cloudnative-pg/cnpg-i/pkg/operator"
2425

2526
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/metadata"
26-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/pluginhelper"
2727
)
2828

2929
const (

‎internal/wal/status.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"os"
2424
"path"
2525

26+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/logging"
27+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/pluginhelper"
2628
"github.com/cloudnative-pg/cnpg-i/pkg/wal"
2729

2830
"github.com/cloudnative-pg/plugin-pvc-backup/internal/backup/storage"
29-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/logging"
3031
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/metadata"
31-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/pluginhelper"
3232
)
3333

3434
type walStatMode string

‎internal/wal/wal.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020
"context"
2121
"path"
2222

23+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/logging"
24+
"github.com/cloudnative-pg/cnpg-i-machinery/pkg/pluginhelper"
2325
"github.com/cloudnative-pg/cnpg-i/pkg/wal"
2426

2527
"github.com/cloudnative-pg/plugin-pvc-backup/internal/backup/storage"
2628
"github.com/cloudnative-pg/plugin-pvc-backup/internal/fileutils"
27-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/logging"
2829
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/metadata"
29-
"github.com/cloudnative-pg/plugin-pvc-backup/pkg/pluginhelper"
3030
)
3131

3232
// Archive copies one WAL file into the archive

0 commit comments

Comments
 (0)