diff --git a/cmd/ctl/pkg/upgrade/BUILD.bazel b/cmd/ctl/pkg/upgrade/BUILD.bazel index 765498195..698fb462c 100644 --- a/cmd/ctl/pkg/upgrade/BUILD.bazel +++ b/cmd/ctl/pkg/upgrade/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade", visibility = ["//visibility:public"], deps = [ - "//cmd/ctl/pkg/upgrade/migrate:go_default_library", + "//cmd/ctl/pkg/upgrade/migrateapiversion:go_default_library", "@com_github_spf13_cobra//:go_default_library", "@io_k8s_cli_runtime//pkg/genericclioptions:go_default_library", ], @@ -23,7 +23,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//cmd/ctl/pkg/upgrade/migrate:all-srcs", + "//cmd/ctl/pkg/upgrade/migrateapiversion:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/cmd/ctl/pkg/upgrade/migrate/BUILD.bazel b/cmd/ctl/pkg/upgrade/migrateapiversion/BUILD.bazel similarity index 98% rename from cmd/ctl/pkg/upgrade/migrate/BUILD.bazel rename to cmd/ctl/pkg/upgrade/migrateapiversion/BUILD.bazel index b0d5f869b..83e382363 100644 --- a/cmd/ctl/pkg/upgrade/migrate/BUILD.bazel +++ b/cmd/ctl/pkg/upgrade/migrateapiversion/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "command.go", "migrator.go", ], - importpath = "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade/migrate", + importpath = "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade/migrateapiversion", visibility = ["//visibility:public"], deps = [ "//cmd/ctl/pkg/build:go_default_library", diff --git a/cmd/ctl/pkg/upgrade/migrate/command.go b/cmd/ctl/pkg/upgrade/migrateapiversion/command.go similarity index 97% rename from cmd/ctl/pkg/upgrade/migrate/command.go rename to cmd/ctl/pkg/upgrade/migrateapiversion/command.go index 8d9b1baa3..0de16d497 100644 --- a/cmd/ctl/pkg/upgrade/migrate/command.go +++ b/cmd/ctl/pkg/upgrade/migrateapiversion/command.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package migrate +package migrateapiversion import ( "context" @@ -44,7 +44,7 @@ This command must be run with a cluster running cert-manager v1.0 or greater.`)) example = templates.Examples(i18n.T(build.WithTemplate(` # Check the cert-manager installation is ready to be upgraded to v1.7 -{{.BuildName}} upgrade migrate +{{.BuildName}} upgrade migrate-api-version `))) ) @@ -69,7 +69,7 @@ func NewOptions(ioStreams genericclioptions.IOStreams) *Options { func NewCmdMigrate(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command { o := NewOptions(ioStreams) cmd := &cobra.Command{ - Use: "migrate", + Use: "migrate-api-version", Short: "Migrate all existing persisted cert-manager resources to the v1 API version", Long: long, Example: example, diff --git a/cmd/ctl/pkg/upgrade/migrate/migrator.go b/cmd/ctl/pkg/upgrade/migrateapiversion/migrator.go similarity index 99% rename from cmd/ctl/pkg/upgrade/migrate/migrator.go rename to cmd/ctl/pkg/upgrade/migrateapiversion/migrator.go index 16f2ca2d7..64211bd44 100644 --- a/cmd/ctl/pkg/upgrade/migrate/migrator.go +++ b/cmd/ctl/pkg/upgrade/migrateapiversion/migrator.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package migrate +package migrateapiversion import ( "context" diff --git a/cmd/ctl/pkg/upgrade/upgrade.go b/cmd/ctl/pkg/upgrade/upgrade.go index 88fb98e31..2688da38d 100644 --- a/cmd/ctl/pkg/upgrade/upgrade.go +++ b/cmd/ctl/pkg/upgrade/upgrade.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade/migrate" + "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade/migrateapiversion" ) func NewCmdUpgrade(ctx context.Context, ioStreams genericclioptions.IOStreams) *cobra.Command { @@ -32,7 +32,7 @@ func NewCmdUpgrade(ctx context.Context, ioStreams genericclioptions.IOStreams) * Long: `Note: this command does NOT actually upgrade cert-manager installations`, } - cmds.AddCommand(migrate.NewCmdMigrate(ctx, ioStreams)) + cmds.AddCommand(migrateapiversion.NewCmdMigrate(ctx, ioStreams)) return cmds } diff --git a/test/integration/ctl/migrate/BUILD.bazel b/test/integration/ctl/migrate/BUILD.bazel index 4477be44a..e26348168 100644 --- a/test/integration/ctl/migrate/BUILD.bazel +++ b/test/integration/ctl/migrate/BUILD.bazel @@ -7,7 +7,7 @@ go_test( "//pkg/webhook/handlers/testdata/apis/testgroup/crds:all-srcs", ], deps = [ - "//cmd/ctl/pkg/upgrade/migrate:go_default_library", + "//cmd/ctl/pkg/upgrade/migrateapiversion:go_default_library", "//pkg/webhook/handlers:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/install:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/v1:go_default_library", diff --git a/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go b/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go index 5eb39399e..2144adf00 100644 --- a/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go +++ b/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade/migrate" + "github.com/jetstack/cert-manager/cmd/ctl/pkg/upgrade/migrateapiversion" "github.com/jetstack/cert-manager/pkg/webhook/handlers" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/install" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v1" @@ -134,7 +134,7 @@ func TestCtlUpgradeMigrate(t *testing.T) { } // Run the migrator and migrate all objects to the 'nonStorageVersion' (which is now the new storage version) - migrator := migrate.NewMigrator(cl, false, os.Stdout, os.Stderr) + migrator := migrateapiversion.NewMigrator(cl, false, os.Stdout, os.Stderr) migrated, err := migrator.Run(ctx, nonStorageVersion, []string{crdName}) if err != nil { t.Errorf("migrator failed to run: %v", err) @@ -212,7 +212,7 @@ func TestCtlUpgradeMigrate_FailsIfStorageVersionDoesNotEqualTargetVersion(t *tes } // We expect this to fail, as we are attempting to migrate to the 'nonStorageVersion'. - migrator := migrate.NewMigrator(cl, false, os.Stdout, os.Stderr) + migrator := migrateapiversion.NewMigrator(cl, false, os.Stdout, os.Stderr) migrated, err := migrator.Run(ctx, nonStorageVersion, []string{crdName}) if err == nil { t.Errorf("expected an error to be returned but we got none") @@ -275,7 +275,7 @@ func TestCtlUpgradeMigrate_SkipsMigrationIfNothingToDo(t *testing.T) { } // We expect this to succeed and for the migration to not be run - migrator := migrate.NewMigrator(cl, false, os.Stdout, os.Stderr) + migrator := migrateapiversion.NewMigrator(cl, false, os.Stdout, os.Stderr) migrated, err := migrator.Run(ctx, storageVersion, []string{crdName}) if err != nil { t.Errorf("unexpected error: %v", err) @@ -335,7 +335,7 @@ func TestCtlUpgradeMigrate_ForcesMigrationIfSkipStoredVersionCheckIsEnabled(t *t } // We expect this to force a migration - migrator := migrate.NewMigrator(cl, true, os.Stdout, os.Stderr) + migrator := migrateapiversion.NewMigrator(cl, true, os.Stdout, os.Stderr) migrated, err := migrator.Run(ctx, storageVersion, []string{crdName}) if err != nil { t.Errorf("unexpected error: %v", err)