2019-04-04 06:43:48 +00:00
|
|
|
# Development Guide
|
|
|
|
|
|
|
|
## New to Go
|
|
|
|
|
|
|
|
Ceph-csi is written in Go and if you are new to the language,
|
|
|
|
it is **highly** encouraged to:
|
2019-04-04 06:29:59 +00:00
|
|
|
|
|
|
|
* Take the [A Tour of Go](http://tour.golang.org/welcome/1) course.
|
|
|
|
* [Set up](https://golang.org/doc/code.html) Go development environment on your machine.
|
|
|
|
* Read [Effective Go](https://golang.org/doc/effective_go.html) for best practices.
|
|
|
|
|
|
|
|
## Development Workflow
|
|
|
|
|
|
|
|
### Workspace and repository setup
|
|
|
|
|
2020-05-04 09:38:02 +00:00
|
|
|
* [Download](https://golang.org/dl/) Go (>=1.13.x) and
|
2019-04-04 06:43:48 +00:00
|
|
|
[install](https://golang.org/doc/install) it on your system.
|
|
|
|
* Setup the [GOPATH](http://www.g33knotes.org/2014/07/60-second-count-down-to-go.html)
|
|
|
|
environment.
|
2020-05-04 09:38:02 +00:00
|
|
|
* `CGO_ENABLED` is enabled by default, if `CGO_ENABLED` is set to `0` we need
|
|
|
|
to set it to `1` as we need to build with go-ceph bindings.
|
|
|
|
* `GO111MODULE` is enabled by default, if `GO111MODULE` is set to `off` we need
|
|
|
|
to set it to `on` as cephcsi uses go modules for dependency.
|
2020-03-19 13:27:16 +00:00
|
|
|
* Ceph-CSI uses the native Ceph libaries through the [go-ceph
|
|
|
|
package](https://github.com/ceph/go-ceph). It is required to install the
|
|
|
|
Ceph C headers in order to compile Ceph-CSI. The packages are called
|
|
|
|
`libcephfs-devel`, `librados-devel` and `librbd-devel` on many Linux
|
|
|
|
distributions. See the [go-ceph installaton
|
|
|
|
instructions](https://github.com/ceph/go-ceph#installation) for more
|
|
|
|
details.
|
2019-04-04 06:43:48 +00:00
|
|
|
* Run `$ go get -d github.com/ceph/ceph-csi`
|
|
|
|
This will just download the source and not build it. The downloaded source
|
|
|
|
will be at `$GOPATH/src/github.com/ceph/ceph-csi`
|
|
|
|
* Fork the [ceph-csi repo](https://github.com/ceph/ceph-csi) on Github.
|
|
|
|
* Add your fork as a git remote:
|
2019-04-04 06:29:59 +00:00
|
|
|
`$ git remote add fork https://github.com/<your-github-username>/ceph-csi`
|
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
> Editors: Our favorite editor is vim with the [vim-go](https://github.com/fatih/vim-go)
|
|
|
|
> plugin, but there are many others like [vscode](https://github.com/Microsoft/vscode-go)
|
2019-04-04 06:29:59 +00:00
|
|
|
|
|
|
|
### Building Ceph-CSI
|
|
|
|
|
2019-12-30 19:47:02 +00:00
|
|
|
To build ceph-csi locally run:
|
2019-04-04 06:29:59 +00:00
|
|
|
`$ make`
|
|
|
|
|
2019-12-30 19:47:02 +00:00
|
|
|
To build ceph-csi in a container:
|
|
|
|
`$ make containerized-build`
|
|
|
|
|
2019-04-04 06:29:59 +00:00
|
|
|
The built binary will be present under `_output/` directory.
|
|
|
|
|
2020-04-21 13:41:17 +00:00
|
|
|
### Running Ceph-CSI tests in a container
|
|
|
|
|
|
|
|
Once the changes to the sources compile, it is good practise to run the tests
|
|
|
|
that validate the style and other basics of the source code. Execute the unit
|
|
|
|
tests (in the `*_test.go` files) and check the formatting of YAML files,
|
|
|
|
MarkDown documents and shell scripts:
|
|
|
|
|
|
|
|
`$ make containerized-test`
|
|
|
|
|
|
|
|
It is also possible to run only selected tests, these are the targets in the
|
|
|
|
`Makefile` in the root of the project. For example, run the different static
|
|
|
|
checks with:
|
|
|
|
|
|
|
|
`$ make containerized-test TARGET=static-check`
|
|
|
|
|
|
|
|
In addition to running tests locally, each Pull Request that is created will
|
|
|
|
trigger Continous Integration tests that include the `containerized-test`, but
|
|
|
|
also additional functionality tests that are defined under the `e2e/`
|
|
|
|
directory.
|
|
|
|
|
2019-04-04 06:29:59 +00:00
|
|
|
### Code contribution workflow
|
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
ceph-csi repository currently follows GitHub's
|
|
|
|
[Fork & Pull] (<https://help.github.com/articles/about-pull-requests/>) workflow
|
|
|
|
for code contributions.
|
2019-04-04 06:29:59 +00:00
|
|
|
|
|
|
|
Please read the [coding guidelines](coding.md) document before submitting a PR.
|
|
|
|
|
2020-05-05 10:26:34 +00:00
|
|
|
#### Certificate of Origin
|
|
|
|
|
|
|
|
By contributing to this project you agree to the Developer Certificate of
|
|
|
|
Origin (DCO). This document was created by the Linux Kernel community and is a
|
|
|
|
simple statement that you, as a contributor, have the legal right to make the
|
|
|
|
contribution. See the [DCO](DCO) file for details.
|
|
|
|
|
|
|
|
Contributors sign-off that they adhere to these requirements by adding a
|
|
|
|
Signed-off-by line to commit messages. For example:
|
|
|
|
|
|
|
|
```text
|
|
|
|
subsystem: This is my commit message
|
|
|
|
|
|
|
|
More details on what this commit does
|
|
|
|
|
|
|
|
Signed-off-by: Random J Developer <random@developer.example.org>
|
|
|
|
```
|
|
|
|
|
|
|
|
If you have already made a commit and forgot to include the sign-off, you can
|
|
|
|
amend your last commit to add the sign-off with the following command, which
|
|
|
|
can then be force pushed.
|
|
|
|
|
|
|
|
```console
|
|
|
|
git commit --amend -s
|
|
|
|
```
|
|
|
|
|
|
|
|
We use a [DCO bot](https://github.com/apps/dco) to enforce the DCO on each pull
|
|
|
|
request and branch commits.
|
|
|
|
|
|
|
|
#### Commit Messages
|
|
|
|
|
|
|
|
We follow a rough convention for commit messages that is designed to answer two
|
|
|
|
questions: what changed and why? The subject line should feature the what and
|
|
|
|
the body of the commit should describe the why.
|
|
|
|
|
|
|
|
```text
|
|
|
|
cephfs: update cephfs resize
|
|
|
|
|
|
|
|
use cephfs resize to resize subvolume
|
|
|
|
|
|
|
|
Signed-off-by: Random J Developer <random@developer.example.org>
|
|
|
|
```
|
|
|
|
|
|
|
|
The format can be described more formally as follows:
|
|
|
|
|
|
|
|
```text
|
2020-05-11 12:51:27 +00:00
|
|
|
<component>: <subject of the change>
|
2020-05-05 10:26:34 +00:00
|
|
|
<BLANK LINE>
|
2020-05-11 12:51:27 +00:00
|
|
|
<paragraph(s) with reason/description>
|
2020-05-05 10:26:34 +00:00
|
|
|
<BLANK LINE>
|
2020-05-11 12:51:27 +00:00
|
|
|
<signed-off-by>
|
2020-05-05 10:26:34 +00:00
|
|
|
```
|
|
|
|
|
2020-05-11 12:51:27 +00:00
|
|
|
The `component` in the subject of the commit message can be one of the following:
|
|
|
|
|
|
|
|
* `cephfs`: bugs or enhancements related to CephFS
|
|
|
|
* `rbd`: bugs or enhancements related to RBD
|
|
|
|
* `doc`: documentation updates
|
|
|
|
* `util`: utilities shared between components use `cephfs` or `rbd` if the
|
|
|
|
change is only relevant for one of the type of storage
|
|
|
|
* `journal`: any of the journalling functionalities
|
|
|
|
* `helm`: deployment changes for the Helm charts
|
|
|
|
* `deploy`: updates to Kubernetes templates for deploying components
|
|
|
|
* `build`: anything related to building Ceph-CSI, the executable or container
|
|
|
|
images
|
|
|
|
* `ci`: changes related to the Continuous Integration, or testing
|
|
|
|
* `e2e`: end-to-end testing updates
|
|
|
|
* `cleanup`: general maintenance and cleanup changes
|
|
|
|
* `revert`: undo a commit that was merged by mistake, use of one of the other
|
|
|
|
components is in most cases recommended
|
|
|
|
|
2020-05-05 10:26:34 +00:00
|
|
|
The first line is the subject and should be no longer than 70 characters, the
|
|
|
|
second line is always blank, and other lines should be wrapped at 80 characters.
|
|
|
|
This allows the message to be easier to read on GitHub as well as in various
|
|
|
|
git tools.
|
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
Here is a short guide on how to work on a new patch. In this example, we will
|
|
|
|
work on a patch called *hellopatch*:
|
2019-04-04 06:29:59 +00:00
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
* `$ git checkout master`
|
|
|
|
* `$ git pull`
|
|
|
|
* `$ git checkout -b hellopatch`
|
2019-04-04 06:29:59 +00:00
|
|
|
|
|
|
|
Do your work here and commit.
|
|
|
|
|
|
|
|
Run the test suite, which includes linting checks, static code check, and unit
|
|
|
|
tests:
|
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
`$ make test`
|
2019-04-04 06:29:59 +00:00
|
|
|
|
2020-03-24 07:53:55 +00:00
|
|
|
Certain unit tests may require extended permissions or other external resources
|
|
|
|
that are not available by default. To run these tests as well, export the
|
|
|
|
environment variable `CEPH_CSI_RUN_ALL_TESTS=1` before running the tests.
|
|
|
|
|
2019-04-04 06:29:59 +00:00
|
|
|
You will need to provide unit tests and functional tests for your changes
|
2019-04-04 06:43:48 +00:00
|
|
|
wherever applicable.
|
2019-04-04 06:29:59 +00:00
|
|
|
|
|
|
|
Once you are ready to push, you will type the following:
|
|
|
|
|
|
|
|
`$ git push fork hellopatch`
|
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
**Creating A Pull Request:**
|
|
|
|
When you are satisfied with your changes, you will then need to go to your repo
|
|
|
|
in GitHub.com and create a pull request for your branch. Automated tests will
|
|
|
|
be run against the pull request. Your pull request will be reviewed and merged.
|
2019-04-04 06:29:59 +00:00
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
If you are planning on making a large set of changes or a major architectural
|
|
|
|
change it is often desirable to first build a consensus in an issue discussion
|
|
|
|
and/or create an initial design doc PR. Once the design has been agreed upon
|
|
|
|
one or more PRs implementing the plan can be made.
|
2019-04-04 06:29:59 +00:00
|
|
|
|
|
|
|
**Review Process:**
|
2019-04-04 06:43:48 +00:00
|
|
|
Once your PR has been submitted for review the following critieria will
|
|
|
|
need to be met before it will be merged:
|
|
|
|
|
|
|
|
* Each PR needs reviews accepting the change from at least two developers
|
|
|
|
* for merging
|
|
|
|
* It is common to request reviews from those reviewers automatically suggested
|
|
|
|
* by github
|
|
|
|
* Each PR needs to have been open for at least 24 working hours to allow for
|
|
|
|
* community feedback
|
|
|
|
* The 24 working hours counts hours occuring Mon-Fri in the local timezone
|
|
|
|
* of the submitter
|
2019-04-04 06:29:59 +00:00
|
|
|
* Each PR must be fully updated to master and tests must have passed
|
2020-05-15 08:25:09 +00:00
|
|
|
* If the PR is having trivial changes or the reviewer is confident enough that
|
|
|
|
PR doesn't need a second review, the reviewer can set `ready-to-merge` label
|
|
|
|
on the PR. The bot will merge the PR if it's having one approval and the
|
|
|
|
label `ready-to-merge`
|
2019-04-04 06:29:59 +00:00
|
|
|
|
2019-04-04 06:43:48 +00:00
|
|
|
When the criteria are met, a project maintainer can merge your changes into
|
|
|
|
the project's master branch.
|
2019-09-26 07:40:04 +00:00
|
|
|
|
2019-09-27 08:20:12 +00:00
|
|
|
### Backport a Fix to a Release Branch
|
2019-09-26 07:40:04 +00:00
|
|
|
|
2019-09-27 08:20:12 +00:00
|
|
|
The flow for getting a fix into a release branch is:
|
|
|
|
|
|
|
|
1. Open a PR to merge the changes to master following the process outlined above.
|
|
|
|
1. Add the backport label to that PR such as `backport-to-release-vX.Y.Z`
|
|
|
|
1. After your PR is merged to master, the mergify bot will automatically open a
|
|
|
|
PR with your commits backported to the release branch
|
|
|
|
1. If there are any conflicts you will need to resolve them by pulling the
|
|
|
|
branch, resolving the conflicts and force push back the branch
|
|
|
|
1. After the CI is green, the bot will automatically merge the backport PR.
|