diff --git a/hack/upgrade-rollouts-manager/README.md b/hack/upgrade-rollouts-manager/README.md index 5d1ba1aca..bbd4a30f4 100644 --- a/hack/upgrade-rollouts-manager/README.md +++ b/hack/upgrade-rollouts-manager/README.md @@ -12,7 +12,6 @@ The Go code and script in this directory will automatically open a pull request ### Prerequisites - GitHub CLI (_gh_) installed and on PATH - Go installed and on PATH -- Operator-sdk installed and on PATH - You must have your own fork of the [argo-rollouts-manager](https://github.com/argoproj-labs/argo-rollouts-manager) repository in GitHub(e.g. `jgwest/argo-rollouts-manager`) - Your local SSH key registered (e.g. `~/.ssh/id_rsa.pub`) with GitHub to allow git clone via SSH diff --git a/hack/upgrade-rollouts-manager/main.go b/hack/upgrade-rollouts-manager/main.go index 4a131f19a..dc5375b4e 100644 --- a/hack/upgrade-rollouts-manager/main.go +++ b/hack/upgrade-rollouts-manager/main.go @@ -47,7 +47,7 @@ func main() { } commitIds := strings.Split(stdout, "\n") if len(commitIds) == 0 { - exitWithError(fmt.Errorf("unable to retrive commit ids")) + exitWithError(fmt.Errorf("unable to retrieve commit ids")) } mostRecentCommitID := commitIds[0] @@ -133,7 +133,7 @@ func createNewCommitAndBranch(latestRolloutsManagerCommitId string, newBranchNam {"git", "stash"}, {"git", "fetch", "parent"}, {"git", "checkout", "master"}, - {"git", "rebase", "parent/master"}, + {"git", "reset", "--hard", "parent/master"}, {"git", "checkout", "-b", newBranchName}, } @@ -257,7 +257,7 @@ func regenerateE2ETestScript(commitID string, pathToGitRepo string) error { for _, line := range strings.Split(string(fileBytes), "\n") { - if strings.Contains(line, envName) { + if strings.HasPrefix(line, envName+"=") { res += envName + "=" + commitID + "\n"