diff --git a/changelogs/unreleased/10759-adam-jian-zhang b/changelogs/unreleased/10759-adam-jian-zhang new file mode 100644 index 000000000..8f4f02e51 --- /dev/null +++ b/changelogs/unreleased/10759-adam-jian-zhang @@ -0,0 +1 @@ +Move internal/resourcemodifiers to pkg/resourcemodifiers for plugin reuse diff --git a/pkg/cmd/cli/restore/create.go b/pkg/cmd/cli/restore/create.go index 85beb4a97..39a945d51 100644 --- a/pkg/cmd/cli/restore/create.go +++ b/pkg/cmd/cli/restore/create.go @@ -31,7 +31,6 @@ import ( "k8s.io/client-go/tools/cache" kbclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcemodifiers" "github.com/velero-io/velero/internal/resourcepolicies" api "github.com/velero-io/velero/pkg/apis/velero/v1" "github.com/velero-io/velero/pkg/client" @@ -39,6 +38,7 @@ import ( "github.com/velero-io/velero/pkg/cmd/cli" "github.com/velero-io/velero/pkg/cmd/util/flag" "github.com/velero-io/velero/pkg/cmd/util/output" + "github.com/velero-io/velero/pkg/resourcemodifiers" "github.com/velero-io/velero/pkg/util/boolptr" "github.com/velero-io/velero/pkg/util/kube" "github.com/velero-io/velero/pkg/util/velero/restore" diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go index 219c5fd0c..1add96061 100644 --- a/pkg/controller/restore_controller.go +++ b/pkg/controller/restore_controller.go @@ -43,7 +43,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/resourcemodifiers" "github.com/velero-io/velero/internal/resourcepolicies" "github.com/velero-io/velero/internal/volume" api "github.com/velero-io/velero/pkg/apis/velero/v1" @@ -54,6 +53,7 @@ import ( "github.com/velero-io/velero/pkg/persistence" "github.com/velero-io/velero/pkg/plugin/clientmgmt" "github.com/velero-io/velero/pkg/plugin/framework" + "github.com/velero-io/velero/pkg/resourcemodifiers" pkgrestore "github.com/velero-io/velero/pkg/restore" "github.com/velero-io/velero/pkg/util/boolptr" "github.com/velero-io/velero/pkg/util/collections" diff --git a/pkg/controller/restore_controller_test.go b/pkg/controller/restore_controller_test.go index c340984ea..95d9b8d17 100644 --- a/pkg/controller/restore_controller_test.go +++ b/pkg/controller/restore_controller_test.go @@ -35,7 +35,6 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/velero-io/velero/internal/resourcemodifiers" "github.com/velero-io/velero/internal/volume" velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" "github.com/velero-io/velero/pkg/builder" @@ -45,6 +44,7 @@ import ( "github.com/velero-io/velero/pkg/plugin/framework" pluginmocks "github.com/velero-io/velero/pkg/plugin/mocks" riav2 "github.com/velero-io/velero/pkg/plugin/velero/restoreitemaction/v2" + "github.com/velero-io/velero/pkg/resourcemodifiers" pkgrestore "github.com/velero-io/velero/pkg/restore" velerotest "github.com/velero-io/velero/pkg/test" "github.com/velero-io/velero/pkg/util/logging" diff --git a/internal/resourcemodifiers/json_merge_patch.go b/pkg/resourcemodifiers/json_merge_patch.go similarity index 100% rename from internal/resourcemodifiers/json_merge_patch.go rename to pkg/resourcemodifiers/json_merge_patch.go diff --git a/internal/resourcemodifiers/json_merge_patch_test.go b/pkg/resourcemodifiers/json_merge_patch_test.go similarity index 100% rename from internal/resourcemodifiers/json_merge_patch_test.go rename to pkg/resourcemodifiers/json_merge_patch_test.go diff --git a/internal/resourcemodifiers/json_patch.go b/pkg/resourcemodifiers/json_patch.go similarity index 100% rename from internal/resourcemodifiers/json_patch.go rename to pkg/resourcemodifiers/json_patch.go diff --git a/internal/resourcemodifiers/resource_modifiers.go b/pkg/resourcemodifiers/resource_modifiers.go similarity index 100% rename from internal/resourcemodifiers/resource_modifiers.go rename to pkg/resourcemodifiers/resource_modifiers.go diff --git a/internal/resourcemodifiers/resource_modifiers_test.go b/pkg/resourcemodifiers/resource_modifiers_test.go similarity index 100% rename from internal/resourcemodifiers/resource_modifiers_test.go rename to pkg/resourcemodifiers/resource_modifiers_test.go diff --git a/internal/resourcemodifiers/resource_modifiers_validator.go b/pkg/resourcemodifiers/resource_modifiers_validator.go similarity index 100% rename from internal/resourcemodifiers/resource_modifiers_validator.go rename to pkg/resourcemodifiers/resource_modifiers_validator.go diff --git a/internal/resourcemodifiers/resource_modifiers_validator_test.go b/pkg/resourcemodifiers/resource_modifiers_validator_test.go similarity index 100% rename from internal/resourcemodifiers/resource_modifiers_validator_test.go rename to pkg/resourcemodifiers/resource_modifiers_validator_test.go diff --git a/internal/resourcemodifiers/strategic_merge_patch.go b/pkg/resourcemodifiers/strategic_merge_patch.go similarity index 100% rename from internal/resourcemodifiers/strategic_merge_patch.go rename to pkg/resourcemodifiers/strategic_merge_patch.go diff --git a/internal/resourcemodifiers/strategic_merge_patch_test.go b/pkg/resourcemodifiers/strategic_merge_patch_test.go similarity index 100% rename from internal/resourcemodifiers/strategic_merge_patch_test.go rename to pkg/resourcemodifiers/strategic_merge_patch_test.go diff --git a/pkg/restore/request.go b/pkg/restore/request.go index f175a04ca..04f9f8386 100644 --- a/pkg/restore/request.go +++ b/pkg/restore/request.go @@ -25,11 +25,11 @@ import ( "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime" - "github.com/velero-io/velero/internal/resourcemodifiers" "github.com/velero-io/velero/internal/resourcepolicies" "github.com/velero-io/velero/internal/volume" velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" "github.com/velero-io/velero/pkg/itemoperation" + "github.com/velero-io/velero/pkg/resourcemodifiers" "github.com/velero-io/velero/pkg/util/kube" ) diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 34bb703ad..69ac43695 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -56,7 +56,6 @@ import ( "github.com/velero-io/velero/internal/credentials" "github.com/velero-io/velero/internal/hook" - "github.com/velero-io/velero/internal/resourcemodifiers" "github.com/velero-io/velero/internal/resourcepolicies" "github.com/velero-io/velero/internal/volume" velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1" @@ -74,6 +73,7 @@ import ( "github.com/velero-io/velero/pkg/podexec" "github.com/velero-io/velero/pkg/podvolume" "github.com/velero-io/velero/pkg/podvolume/configs" + "github.com/velero-io/velero/pkg/resourcemodifiers" "github.com/velero-io/velero/pkg/types" "github.com/velero-io/velero/pkg/util/boolptr" "github.com/velero-io/velero/pkg/util/collections"