Skip to content

chore(main): release 0.6.0 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camilb merged 5 commits into from
Jun 24, 2025
Merged

chore(main): release 0.6.0 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4569a1
chore(main): release 0.6.0
camilb Jun 24, 2025
2d9ee7a
Merge branch 'main' into release-please--branches--main
camilb Jun 24, 2025
772f94b
Update import paths from cloudnative-pg to edkadigital
camilb Jun 24, 2025
6389d8a
Update Makefile
camilb Jun 24, 2025
d05962f
Update Makefile
camilb Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.5.0"
".": "0.6.0"
}
90 changes: 90 additions & 0 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes

.PHONY: build
build: manifests generate fmt vet ## Build manager binary.
go build -o bin/manager cmd/main.go
go build -o bin/manager cmd/manager/main.go

.PHONY: run
run: manifests generate fmt vet ## Run a controller from your host.
go run ./cmd/main.go
go run ./cmd/manager/main.go

# If you wish to build the manager image targeting other platforms you can use the --platform flag.
# (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.
Expand Down Expand Up @@ -159,9 +159,9 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint

## Tool Versions
KUSTOMIZE_VERSION ?= v5.4.3
CONTROLLER_TOOLS_VERSION ?= v0.16.1
CONTROLLER_TOOLS_VERSION ?= v0.18.0
ENVTEST_VERSION ?= release-0.19
GOLANGCI_LINT_VERSION ?= v1.64.8
GOLANGCI_LINT_VERSION ?= v1.62.2

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
8 changes: 4 additions & 4 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/spf13/cobra"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/healthcheck"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/instance"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/operator"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/restore"
"github.com/edkadigital/plugin-barman-cloud/internal/cmd/healthcheck"
"github.com/edkadigital/plugin-barman-cloud/internal/cmd/instance"
"github.com/edkadigital/plugin-barman-cloud/internal/cmd/operator"
"github.com/edkadigital/plugin-barman-cloud/internal/cmd/restore"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/healthcheck/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/health/grpc_health_v1"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

// NewCmd returns the healthcheck command
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/instance/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/instance"
)

// NewCmd creates a new instance command
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator"
)

// NewCmd creates a new operator command
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/restore/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/restore"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/restore"
)

// NewCmd creates the "restore" subcommand
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

barmanapi "github.com/cloudnative-pg/barman-cloud/pkg/api"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

// TODO: refactor.
Expand Down
6 changes: 3 additions & 3 deletions internal/cnpgi/common/wal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

// ErrMissingPermissions is raised when the sidecar has no
Expand Down
6 changes: 3 additions & 3 deletions internal/cnpgi/instance/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

// BackupServiceImplementation is the implementation
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/instance/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cloudnative-pg/cnpg-i/pkg/identity"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

// IdentityImplementation implements IdentityServer
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/instance/internal/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
v1 "github.com/edkadigital/plugin-barman-cloud/api/v1"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions internal/cnpgi/instance/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/scheme"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
extendedclient "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/instance/internal/client"
)

// Start starts the sidecar informers and CNPG-i server
Expand Down
8 changes: 4 additions & 4 deletions internal/cnpgi/instance/retention.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

// defaultRetentionPolicyInterval is the retention policy interval
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/instance/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"google.golang.org/grpc"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common"
)

// CNPGI is the implementation of the PostgreSQL sidecar
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/instance/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"k8s.io/apimachinery/pkg/types"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

type backupResultMetadata struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/cnpgi/metadata/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ const (
// Data is the metadata of this plugin.
var Data = identity.GetPluginMetadataResponse{
Name: PluginName,
Version: "0.5.0", // x-release-please-version
Version: "0.6.0", // x-release-please-version
DisplayName: "BarmanCloudInstance",
ProjectUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud",
RepositoryUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud",
ProjectUrl: "https://github.com/edkadigital/plugin-barman-cloud",
RepositoryUrl: "https://github.com/edkadigital/plugin-barman-cloud",
License: "APACHE 2.0",
LicenseUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud/LICENSE",
LicenseUrl: "https://github.com/edkadigital/plugin-barman-cloud/LICENSE",
Maturity: "alpha",
}
2 changes: 1 addition & 1 deletion internal/cnpgi/operator/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cloudnative-pg/machinery/pkg/stringset"
"k8s.io/apimachinery/pkg/types"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

// ConfigurationError represents a mistake in the plugin configuration
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/operator/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cloudnative-pg/cnpg-i/pkg/identity"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

// IdentityImplementation is the implementation of the CNPG-i
Expand Down
4 changes: 2 additions & 2 deletions internal/cnpgi/operator/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

// LifecycleImplementation is the implementation of the lifecycle handler
Expand Down
6 changes: 3 additions & 3 deletions internal/cnpgi/operator/lifecycle_certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

// barmanCertificatesVolumeName is the name of the volume that hosts
Expand Down
4 changes: 2 additions & 2 deletions internal/cnpgi/operator/lifecycle_envs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

func (impl LifecycleImplementation) collectAdditionalEnvs(
Expand Down
4 changes: 2 additions & 2 deletions internal/cnpgi/operator/lifecycle_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

corev1 "k8s.io/api/core/v1"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

func (impl LifecycleImplementation) collectSidecarResourcesForRecoveryJob(
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/operator/lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions internal/cnpgi/operator/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/controller"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/controller"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
// to ensure that exec-entrypoint and run can make use of them.
Expand Down
6 changes: 3 additions & 3 deletions internal/cnpgi/operator/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
apierrs "k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/specs"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/specs"
)

// ReconcilerImplementation implements the Reconciler capability
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/operator/specs/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
)

// BuildRole builds the Role object for this cluster
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/restore/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cloudnative-pg/cnpg-i/pkg/identity"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
)

// IdentityImplementation implements IdentityServer
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/restore/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
)

var scheme = runtime.NewScheme()
Expand Down
8 changes: 4 additions & 4 deletions internal/cnpgi/restore/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/cnpgi/restore/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"google.golang.org/grpc"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common"
"github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common"
)

// CNPGI is the implementation of the PostgreSQL sidecar
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/objectstore_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"
)

// ObjectStoreReconciler reconciles a ObjectStore object.
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/objectstore_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1"
barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ import (
kustomizeTypes "sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/resid"

internalClient "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/client"
"github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/deployment"
"github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/e2etestenv"
"github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/kustomize"
internalClient "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/client"
"github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/deployment"
"github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/e2etestenv"
"github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/kustomize"

_ "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/tests/backup"
_ "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/tests/replicacluster"
_ "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/tests/backup"
_ "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/tests/replicacluster"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
Loading
Loading