Skip to content

Commit

Permalink
Address review
Browse files Browse the repository at this point in the history
Signed-off-by: Sergen Yalçın <yalcinsergen97@gmail.com>
  • Loading branch information
sergenyalcin committed Jun 3, 2021
1 parent 0e9edec commit 24b1bc9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 21 deletions.
39 changes: 18 additions & 21 deletions cmd/convert.go
Expand Up @@ -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
}

Expand All @@ -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

Expand All @@ -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{
Expand Down Expand Up @@ -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
}
}
Expand Down
1 change: 1 addition & 0 deletions completion.yaml
Expand Up @@ -18,6 +18,7 @@ commands:
flags:
- delete-v2-releases
- dry-run
- ignore-already-migrated
- l
- label
- s
Expand Down

0 comments on commit 24b1bc9

Please sign in to comment.