diff --git a/cmd/convert.go b/cmd/convert.go index f692a39..766fa11 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -39,15 +39,14 @@ var ( ) type ConvertOptions struct { - DeleteRelease bool - DryRun bool - MaxReleaseVersions int - ReleaseName string - StorageType string - TillerLabel string - TillerNamespace string - TillerOutCluster bool - // new struct field to ignore already migrated releases + DeleteRelease bool + DryRun bool + MaxReleaseVersions int + ReleaseName string + StorageType string + TillerLabel string + TillerNamespace string + TillerOutCluster bool IgnoreAlreadyMigrated bool } @@ -70,7 +69,7 @@ func newConvertCmd(out io.Writer) *cobra.Command { flags.BoolVar(&deletev2Releases, "delete-v2-releases", false, "v2 release versions are deleted after migration. By default, the v2 release versions are retained") flags.IntVar(&maxReleaseVersions, "release-versions-max", 10, "limit the maximum number of versions converted per release. Use 0 for no limit") - flags.BoolVarP(&ignoreAlreadyMigrated, "ignore-already-migrated", "e", false, "Ignore the already migrated releases to provide idempotency") + flags.BoolVar(&ignoreAlreadyMigrated, "ignore-already-migrated", false, "Ignore any already migrated release versions and continue migrating") return cmd @@ -82,16 +81,14 @@ func runConvert(cmd *cobra.Command, args []string) error { return errors.New("release-storage flag needs to be 'configmaps' or 'secrets'") } convertOptions := ConvertOptions{ - DeleteRelease: deletev2Releases, - DryRun: settings.DryRun, - MaxReleaseVersions: maxReleaseVersions, - ReleaseName: releaseName, - StorageType: settings.ReleaseStorage, - TillerLabel: settings.Label, - TillerNamespace: settings.TillerNamespace, - TillerOutCluster: settings.TillerOutCluster, - - // put the variable to struct + DeleteRelease: deletev2Releases, + DryRun: settings.DryRun, + MaxReleaseVersions: maxReleaseVersions, + ReleaseName: releaseName, + StorageType: settings.ReleaseStorage, + TillerLabel: settings.Label, + TillerNamespace: settings.TillerNamespace, + TillerOutCluster: settings.TillerOutCluster, IgnoreAlreadyMigrated: ignoreAlreadyMigrated, } kubeConfig := common.KubeConfig{ @@ -154,7 +151,7 @@ func Convert(convertOptions ConvertOptions, kubeConfig common.KubeConfig) error if convertOptions.IgnoreAlreadyMigrated { if driver.ErrReleaseExists.Error() == err.Error() { - log.Printf("[Warning Helm 3] Release \"%s\" already exists.\n", relVerName) + log.Printf("[Helm 3] ReleaseVersion \"%s\" already exists.\n", relVerName) continue } } diff --git a/completion.yaml b/completion.yaml index cf8a59d..c8fae83 100644 --- a/completion.yaml +++ b/completion.yaml @@ -18,6 +18,7 @@ commands: flags: - delete-v2-releases - dry-run + - ignore-already-migrated - l - label - s