diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82f967e3c..43e83786d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build on: push: - branches: [master] + branches: [main] jobs: build_and_test: @@ -25,7 +25,7 @@ jobs: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_COLOR: "#BD3232" SLACK_ICON: https://github.com/actions.png?size=48 - SLACK_MESSAGE: "Build and test failed for move2kube master" + SLACK_MESSAGE: "Build and test failed for move2kube main" SLACK_TITLE: Failed SLACK_USERNAME: GitHubActions @@ -67,7 +67,7 @@ jobs: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_COLOR: "#BD3232" SLACK_ICON: https://github.com/actions.png?size=48 - SLACK_MESSAGE: "Tests on move2kube-tests failed for move2kube master" + SLACK_MESSAGE: "Tests on move2kube-tests failed for move2kube main" SLACK_TITLE: Failed SLACK_USERNAME: GitHubActions diff --git a/.github/workflows/prbuild.yml b/.github/workflows/prbuild.yml index 120dd54fb..426b83b13 100644 --- a/.github/workflows/prbuild.yml +++ b/.github/workflows/prbuild.yml @@ -2,7 +2,7 @@ name: PR Build on: pull_request: - branches: [master] + branches: [main] jobs: build: diff --git a/README.md b/README.md index e787cbad0..be24708a8 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Move2Kube is a command-line tool that accelerates the process of re-platforming ## Install -Command line : `curl -L https://raw.githubusercontent.com/konveyor/move2kube/master/scripts/install.sh | bash -` +Command line : `curl -L https://raw.githubusercontent.com/konveyor/move2kube/main/scripts/install.sh | bash -` UI : Clone `https://github.com/konveyor/move2kube-ui` and run `docker-compose up`. The UI will now be accessible in `http://localhost:8080`. ## Usage diff --git a/contributing.md b/contributing.md index a52763d7a..1a69096db 100644 --- a/contributing.md +++ b/contributing.md @@ -18,7 +18,7 @@ In order to contribute please follow this process: Once you are ready to have your work merged into the main repo follow these steps: 1. Fetch the latest commits from upstream. `git fetch upstream` -2. Rebase the commits from your branch onto the master branch. `git rebase upstream/master` +2. Rebase the commits from your branch onto the main branch. `git rebase upstream/main` - Note: You will need to fix any merge conflicts that occur. 3. Once all conflicts have been resolved, push the commits to your fork (`git push`) and submit a pull request on Github. 4. The pull request may be merged after CI checks have passed and at least one maintainer has signed off on it. diff --git a/docs/docker-containerization.md b/docs/docker-containerization.md index 5c79a42a0..f047ab93e 100644 --- a/docs/docker-containerization.md +++ b/docs/docker-containerization.md @@ -5,21 +5,22 @@ We elaborate on how new language-platform support could be added using docker file containerization with a running example of one of the samples (namely, `java-maven`). ## Steps -1. Follow the steps mentioned [here](https://github.com/konveyor/move2kube-demos/blob/main/tutorials/dockerfile-containerization.md) to create and test the dockerfile and script before actually including it in the code. + +1. Follow the steps mentioned [here](https://github.com/konveyor/move2kube-demos/blob/main/tutorials/dockerfile-containerization.md) to create and test the dockerfile and script before actually including it in the code. 2. If tests pass, copy the sample you have used for the new language-platform in: ``` - https://github.com/konveyor/move2kube/tree/master/samples + https://github.com/konveyor/move2kube/tree/main/samples ``` -3. Create a directory for the new language-platform in: +3. Create a directory for the new language-platform in: ``` - https://github.com/konveyor/move2kube/tree/master/internal/assets/dockerfiles + https://github.com/konveyor/move2kube/tree/main/internal/assets/dockerfiles ``` and add the **dockerfile template** and `m2kdfdetect.sh` to it. -4. Perform the following steps to build the code: +4. Perform the following steps to build the code: ``` make generate make build ``` 5. Repeat the steps in **Generate and test** section from this [document](https://github.com/konveyor/move2kube-demos/blob/main/tutorials/dockerfile-containerization.md) to test the dockerfile and script created from previous steps. -7. Updates any related test cases for the above changes. -8. Once the test passes, commit the code with sign-off and create a pull request by following steps specified [here](https://github.com/konveyor/move2kube/blob/master/contributing.md). +6. Updates any related test cases for the above changes. +7. Once the test passes, commit the code with sign-off and create a pull request by following steps specified [here](https://github.com/konveyor/move2kube/blob/main/contributing.md). diff --git a/git-workflow.md b/git-workflow.md index cbd0de15f..b10fe3429 100644 --- a/git-workflow.md +++ b/git-workflow.md @@ -22,15 +22,15 @@ Often our `local` repo and our fork `origin` will lag behind the main repo `upst It is important to sync up with `upstream` before we rebase and submit a pull request on Github. 1. Get the latest code from upstream: `git fetch upstream` -1. Switch to the master branch: `git checkout master` -1. Fast forward your local master branch to catch up with upstream: `git merge --ff-only upstream/master` +1. Switch to the main branch: `git checkout main` +1. Fast forward your local main branch to catch up with upstream: `git merge --ff-only upstream/main` 1. Push the changes to your fork: `git push` ## Making changes -**ALWAYS BRANCH OUT OF MASTER** +**ALWAYS BRANCH OUT OF MAIN** 1. Follow the steps to sync up with `upstream`. -1. Switch to the master branch: `git checkout master` +1. Switch to the main branch: `git checkout main` 1. Create a new branch and check it out: `git checkout -b my-feature-or-bug-fix-branch` 1. Make some changes. 1. Add all changes to the staging area before committing: `git add -A` @@ -44,10 +44,10 @@ It is important to sync up with `upstream` before we rebase and submit a pull re 1. Make sure all the changes are committed and the working tree is clean: `git status` 1. Follow the steps to sync up with `upstream`. 1. `git checkout my-feature-or-bug-fix-branch` -1. Rebase onto the `upstream/master` branch: `git rebase upstream/master` . Fix any merge conflicts that occur. +1. Rebase onto the `upstream/main` branch: `git rebase upstream/main` . Fix any merge conflicts that occur. 1. Make sure the rebased code passes build and test: `make ci` 1. After a successful rebase push the changes to your fork: `git push --force` -1. Submit a pull request on Github between your branch `my-feature-or-bug-fix-branch` on your fork `origin` and the `master` branch on `upstream`. +1. Submit a pull request on Github between your branch `my-feature-or-bug-fix-branch` on your fork `origin` and the `main` branch on `upstream`. ## Making changes to the current commit You can change the commit message of the current commit using: `git commit --amend -m 'my new commit message'` @@ -63,7 +63,7 @@ As we keep creating new branches for each pull request, eventually you can end u This doesn't affect anything other than visual clutter when doing `git log --graph --all`. You may also want to reuse an old branch name such as `bugfix`. -1. Checkout a branch you aren't going to delete: `git checkout master` +1. Checkout a branch you aren't going to delete: `git checkout main` 1. Delete the old branch locally: `git branch -d oldbranch` 1. Delete it on the fork: `git push -d origin oldbranch` diff --git a/internal/apiresource/pipeline.go b/internal/apiresource/pipeline.go index 205c448eb..d61e2a7c8 100644 --- a/internal/apiresource/pipeline.go +++ b/internal/apiresource/pipeline.go @@ -32,7 +32,7 @@ import ( const ( pipelineKind = "Pipeline" - defaultGitRepoBranch = "master" + defaultGitRepoBranch = "main" gitRepoURLPlaceholder = "" contextPathPlaceholder = "" dockerfilePathPlaceholder = ""