Skip to content

Commit

Permalink
docs(repo): documentation improvements
Browse files Browse the repository at this point in the history
Signed-off-by: Oliver Bähler <[email protected]>
  • Loading branch information
oliverbaehler authored and prometherion committed Oct 24, 2023
1 parent 747af46 commit 3bd4bc6
Show file tree
Hide file tree
Showing 5 changed files with 163 additions and 26 deletions.
5 changes: 4 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,12 @@ changelog:
- title: '📖 Documentation updates'
regexp: ^.*?docs(\([[:word:]]+\))??!?:.+$
order: 400
- title: '🛡️ Security updates'
regexp: ^.*?(sec)(\([[:word:]]+\))??!?:.+$
order: 500
- title: '🚀 Build process updates'
regexp: ^.*?(build|ci)(\([[:word:]]+\))??!?:.+$
order: 400
order: 600
- title: '📦 Other work'
order: 9999
sboms:
Expand Down
5 changes: 1 addition & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,4 @@ See the [Releases](https://github.com/projectcapsule/capsule/releases)

## Helm Chart

For the helm chart, a dedicated changelog is available in the [chart folder](


This annotation can be provided using two different formats: using a plain list of strings with the description of the change or using a list of objects with some extra structured information (see example below). Please feel free to use the one that better suits your needs. The UI experience will be slightly different depending on the choice. When using the list of objects option the valid supported kinds are added, changed, deprecated, removed, fixed and security.
For the helm chart, a dedicated changelog is created based on the chart's annotations ([See](./DEVELOPMENT.md#helm-changelog)).
174 changes: 154 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,33 @@

All contributions are welcome! If you find a bug or have a feature request, please open an issue or submit a pull request.

## Ways to contribute

### 1. Report Issues

Issues to Capsule help improve the project in multiple ways including the following:

* Report potential bugs
* Request a feature
* Request a sample policy

### 2. Engagement
Engage with the community on [Slack](https://kubernetes.slack.com/archives/C03GETTJQRL) and help new users with questions or issues they may have.

### 3. Submit changes
Submit technical changes via pull requests. New contributors may easily view all open issues labeled as [good first issues](https://github.com/projectcapsule/capsule/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) allowing you to get started in an approachable manner.

Once you wish to get started contributing to the code base, please refer to our [development guide](DEVELOPMENT.md) for a how-to. **[We accept pull requests from forks only](#create-a-pull-request)**.

Before creating a pull request, please ensure that your changes are tested and that the documentation is updated accordingly.

When creating a pull request, please visit:

* [commits](#commits)

## Guidelines

The following guidelines outline the semantics and processes which apply to technical contributions to the project.

## Supported Versions
Versions follow [Semantic Versioning](https://semver.org/) terminology and are expressed as `x.y.z`:
Expand All @@ -19,10 +43,129 @@ Prereleases are marked as `-rc.x` (release candidate) and may refere to any type

## Pull Requests

The pull request title is checked according to the described [semantics](#semantics) (pull requests don't require a scope). However pull requests are currently not used to generate the changelog. Check if your pull requests body meets the following criteria:

- reference a previously opened issue: https://docs.github.com/en/github/writing-on-github/autolinked-references-and-urls#issues-and-pull-requests
- splitting changes into several and documented small commits
- limit the git subject to 50 characters and write as the continuation of the
sentence "If applied, this commit will ..."
- explain what and why in the body, if more than a trivial change, wrapping at
72 characters

If your pull request in a draft state and not ready yet for review, you can prefix the title with `[WIP]`. This will indicate that work is still ongoing:

[WIP] feat(controller): new cool feature

### Create a Pull Request

Head over to the project repository on GitHub and click the **"Fork"** button. With the forked copy, you can try new ideas and implement changes to the project.

1. **Clone the repository to your device:**

Get the link of your forked repository, paste it in your device terminal and clone it using the command.

```sh
git clone https://hostname/YOUR-USERNAME/YOUR-REPOSITORY
```

2. **Create a branch:**

Create a new brach and navigate to the branch using this command.

```sh
git checkout -b <new-branch>
```

3. **Stage, Commit, and Push changes:**

Now that we have implemented the required changes, use the command below to stage the changes and commit them.

```sh
git add .
```

```sh
git commit -s -m "Commit message"
```

Go ahead and push your changes to GitHub using this command.

```sh
git push
```

## Commits

Commit messages should indicate the change and it's impact. The general format for commit messages is the following:
The commit message is checked according to the described [semantics](#semantics). Commits are used to generate the changelog and their author will be referenced in the changelog.

### Reorganising commits

To reorganise your commits, do the following (or use your way of doing it):


1. Pull upstream changes

```bash
git remote add upstream [email protected]:projectcapsule/capsule.git
git pull upstream main
```

2. Pick the current upstream HEAD (the commit is marked with `(remote/main, main)`)

```bash
git log
....
commit 10bbf39ac1ac3ad4f8485422e54faa9aadf03315 (remote/main, main)
Author: Oliver Bähler <[email protected]>
Date: Mon Oct 23 10:24:44 2023 +0200

docs(repo): add sbom reference

Signed-off-by: Oliver Bähler <[email protected]>
```

3. Soft reset to the commit of the upstream HEAD

```bash
git reset --soft 10bbf39ac1ac3ad4f8485422e54faa9aadf03315
```

4. Remove staged files (if any)

```bash
git restore --staged .
```

5. Add files manually and create new [commits](#commits), until all files are included

```bash
git add charts/capsule/
git commit -s -m "feat(chart): add nodeselector value"

...
```

6. Force push the changes to your fork

```bash
git push origin main -f
```

### Sign-Off

Developer Certificate of Origin (DCO) Sign off
For contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project, we are requiring everyone to acknowledge this by signing their work which indicates you agree to the DCO found here.

To sign your work, just add a line like this at the end of your commit message:

Signed-off-by: Random J Developer <[email protected]>
This can easily be done with the -s command line option to append this automatically to your commit message.

git commit -s -m 'This is my commit message'

## Semantics

The semantics should indicate the change and it's impact. The general format for commit messages and pull requests is the following:

feat(ui): Add `Button` component
^ ^ ^
Expand All @@ -32,38 +175,29 @@ Commit messages should indicate the change and it's impact. The general format f

The commits are checked on pull-request. If the commit message does not follow the format, the workflow will fail. See the [Types](#types) and [Scopes](#scopes) sections for more information.

## Types
### Types

The following types are allowed for commits and pull requests:

* `ci` or `build`: changes to buillding process/workflows
* `chore`: housekeeping changes, no production code change
* `ci`: changes to buillding process/workflows
* `docs`: changes to documentation
* `feat`: new features
* `fix`: bug fixes
* `test`: test related changes
* `sec`: security related changes

## Scopes
### Scopes

The following types are allowed for commits and pull requests:

* `all`: changes that affect all components
* `chart`: changes to the Helm chart
* `operator`: changes to the operator
* `docs`: changes to the documentation
* `manifest`: changes to the manifest installer
* `website`: changes to the website
* `ci`: changes to the CI/CD workflows
* `build`: changes to the build process
* `test`: changes to the testing process
* `e2e`: changes to the e2e testing process
* `release`: changes to the release process
* `repo`: changes to general repository files
* `deps`: dependency updates

### Sign-Off

Developer Certificate of Origin (DCO) Sign off
For contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project, we are requiring everyone to acknowledge this by signing their work which indicates you agree to the DCO found here.

To sign your work, just add a line like this at the end of your commit message:

Signed-off-by: Random J Developer <[email protected]>
This can easily be done with the -s command line option to append this automatically to your commit message.

git commit -s -m 'This is my commit message'
* `make`: changes to Makefile
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ Please, refer to the maintainers file available [here](.github/maintainers.yaml)

Please, refer to the [documentation page](https://capsule.clastix.io/docs/contributing/release).

### Changelog

Read how we log changes [here](CHANGELOG.md)

### Software Bill of Materials

All OCI release artifacts include a Software Bill of Materials (SBOM) in CycloneDX JSON format. More information on this is available [here](SECURITY.md#software-bill-of-materials-sbom)
Expand Down
1 change: 0 additions & 1 deletion charts/capsule/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ annotations:
description: artifacthub annotations
- kind: changed
description: maintainers contact

0 comments on commit 3bd4bc6

Please sign in to comment.