Merge pull request #191 from helm/fix-after-main-branch-change

chore(*): Cleanup after main branch name change

README.md

@@ -2,7 +2,7 @@
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Go Report Card](https://goreportcard.com/badge/github.com/helm/helm-2to3)](https://goreportcard.com/report/github.com/helm/helm-2to3)
-[![CircleCI](https://circleci.com/gh/helm/helm-2to3/tree/master.svg?style=svg)](https://circleci.com/gh/helm/helm-2to3/tree/master)
+[![CircleCI](https://circleci.com/gh/helm/helm-2to3/tree/main.svg?style=svg)](https://circleci.com/gh/helm/helm-2to3/tree/main)
 [![Release](https://img.shields.io/github/release/helm/helm-2to3.svg?style=flat-square)](https://github.com/helm/helm-2to3/releases/latest)
 
 ![diagram](./helm-2to3.png)
@@ -147,6 +147,7 @@ Flags:
       --delete-v2-releases         v2 release versions are deleted after migration. By default, the v2 release versions are retained
       --dry-run                    simulate a command
   -h, --help                       help for convert
+      --ignore-already-migrated    Ignore any already migrated release versions and continue migrating
       --kube-context string        name of the kubeconfig context to use
       --kubeconfig string          path to the kubeconfig file
   -l, --label string               label to select Tiller resources by (default "OWNER=TILLER")

plugin.yaml

@@ -1,5 +1,5 @@
 name: "2to3"
-version: "0.8.2"
+version: "0.9.0"
 usage: "migrate and cleanup Helm v2 configuration and releases in-place to Helm v3"
 description: "migrate and cleanup Helm v2 configuration and releases in-place to Helm v3"
 command: "$HELM_PLUGIN_DIR/bin/2to3"

scripts/tag.sh

@@ -4,7 +4,7 @@
 tag="$(cat plugin.yaml | grep "version" | cut -d '"' -f 2)"
 echo "Tagging helm-2to3 with v${tag} ..."
 
-git checkout master
+git checkout main
 git pull
 git tag -a -m "Release v$tag" "v$tag" 
 git push origin refs/tags/v"$tag"