weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rename --force to --skip-stored-version-check

Browse Source 
Signed-off-by: James Munnelly <jmunnelly@apple.com>
This commit is contained in:
James Munnelly 2022-01-06 15:05:40 +00:00
parent 5b50412d1e
commit f6e3458837
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ctl/pkg/upgrade/migrate/command.go
View File

@ -53,8 +53,8 @@ type Options struct {
genericclioptions.IOStreams
*factory.Factory
client client.Client
force bool
client client.Client
skipStoredVersionCheck bool
}
// NewOptions returns initialized Options
@ -80,7 +80,7 @@ func NewCmdMigrate(ctx context.Context, ioStreams genericclioptions.IOStreams) *
},
}
cmd.Flags().BoolVarP(&o.force, "force", "f", o.force, ""+
cmd.Flags().BoolVar(&o.skipStoredVersionCheck, "skip-stored-version-check", o.skipStoredVersionCheck, ""+
"If true, all resources will be read and written regardless of the 'status.storedVersions' on the CRD resource. "+
"Use this mode if you have previously manually modified the 'status.storedVersions' field on CRD resources.")
@ -112,7 +112,7 @@ func (o *Options) Complete() error {
// Run executes renew command
func (o *Options) Run(ctx context.Context, args []string) error {
return NewMigrator(o.client, o.force, o.Out, o.ErrOut).Run(ctx, "v1", []string{
_, err := NewMigrator(o.client, o.skipStoredVersionCheck, o.Out, o.ErrOut).Run(ctx, "v1", []string{
"certificates.cert-manager.io",
"certificaterequests.cert-manager.io",
"issuers.cert-manager.io",
@ -120,4 +120,5 @@ func (o *Options) Run(ctx context.Context, args []string) error {
"orders.acme.cert-manager.io",
"challenges.acme.cert-manager.io",
})
return err
}

20
cmd/ctl/pkg/upgrade/migrate/migrator.go
View File

@ -24,7 +24,7 @@ type Migrator struct {
// If true, skip checking the 'status.storedVersion' before running the migration.
// By default, migration will only be run if the CRD contains storedVersions other
// than the desired target version.
Force bool
SkipStoredVersionCheck bool
// Writers to write informational & error messages to
Out, ErrOut io.Writer
@ -32,7 +32,7 @@ type Migrator struct {
// NewMigrator creates a new migrator with the given API client.
// If either of out or errOut are nil, log messages will be discarded.
func NewMigrator(client client.Client, force bool, out, errOut io.Writer) *Migrator {
func NewMigrator(client client.Client, skipStoredVersionCheck bool, out, errOut io.Writer) *Migrator {
if out == nil {
out = io.Discard
}
@ -41,10 +41,10 @@ func NewMigrator(client client.Client, force bool, out, errOut io.Writer) *Migra
}
return &Migrator{
Client: client,
Force: force,
Out: out,
ErrOut: errOut,
Client: client,
SkipStoredVersionCheck: skipStoredVersionCheck,
Out: out,
ErrOut: errOut,
}
}
@ -65,9 +65,9 @@ func (m *Migrator) Run(ctx context.Context, targetVersion string, names []string
fmt.Fprintf(m.Out, "All CustomResourceDefinitions have %q configured as the storage version.\n", targetVersion)
crdsRequiringMigration := allCRDs
if !m.Force {
fmt.Fprintln(m.Out, "Looking for CRDs that contain resources that require migrating to 'v1'...")
crdsRequiringMigration, err = m.discoverCRDsRequiringMigration(ctx, "v1", names)
if !m.SkipStoredVersionCheck {
fmt.Fprintf(m.Out, "Looking for CRDs that contain resources that require migrating to %q...\n", targetVersion)
crdsRequiringMigration, err = m.discoverCRDsRequiringMigration(ctx, targetVersion, names)
if err != nil {
fmt.Fprintf(m.ErrOut, "Failed to determine resource types that require migration: %v\n", err)
return err
@ -77,7 +77,7 @@ func (m *Migrator) Run(ctx context.Context, targetVersion string, names []string
return nil
}
} else {
fmt.Fprintln(m.Out, "Forcing migration of all CRD resources as --force=true")
fmt.Fprintln(m.Out, "Forcing migration of all CRD resources as --skip-stored-version-check=true")
}
fmt.Fprintf(m.Out, "Found %d resource types that require migration:\n", len(crdsRequiringMigration))