Skip to content

Commit

Permalink
fix(*): use correct branch for helm repo
Browse files Browse the repository at this point in the history
The default branch has been changed to `main`

Signed-off-by: Adam Reese <adam@reese.io>
  • Loading branch information
adamreese committed Apr 1, 2021
1 parent 17ccf69 commit 2c67972
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ issues, mailing lists, meetings, conferences, etc.
- Follow us on [Twitter](communication.md#social-media)
- Join us on [Slack](communication.md#slack)
- Subscribe to our [mailing lists](communication.md#mailing-lists)
- Join the [weekly meeting](communication.md#meetings)
- Join the [weekly meeting](communication.md#meetings)

#### Next, get set-up with the basics (if not already done so):

Expand All @@ -37,7 +37,7 @@ Now, you can get down to business!

A good way to learn is:

- Check out the code and look at code reviews. Documentation and test are part of the code base.
- Check out the code and look at code reviews. Documentation and test are part of the code base.
- Try reproducing issues and get an overview of user problems.
- Talk to people on Slack and ask questions.

Expand Down Expand Up @@ -75,5 +75,5 @@ If you want to work on a new idea of relatively small scope:

[good first issue]: https://github.com/helm/helm/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good+first+issue%22
[issues]: https://github.com/helm/helm/issues
[pull request]: https://github.com/helm/helm/blob/master/CONTRIBUTING.md#pull-requests
[owner]: https://github.com/kubernetes/helm/blob/master/OWNERS
[pull request]: https://github.com/helm/helm/blob/main/CONTRIBUTING.md#pull-requests
[owner]: https://github.com/kubernetes/helm/blob/main/OWNERS
2 changes: 1 addition & 1 deletion Teams.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Helm has a security team and process for handling all security issues. This team

## Helm Client

The [Helm client/CLI](https://github.com/helm/helm) has a dedicated team maintaining it. The members of that team are documented in the [OWNERS](https://github.com/helm/helm/blob/master/OWNERS) file in the root of the project.
The [Helm client/CLI](https://github.com/helm/helm) has a dedicated team maintaining it. The members of that team are documented in the [OWNERS](https://github.com/helm/helm/blob/main/OWNERS) file in the root of the project.

This team can be directly contacted at the private address of cncf-helm-core-maintainers@lists.cncf.io.

Expand Down
2 changes: 1 addition & 1 deletion communication.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ There is also a [#helm-dev](https://kubernetes.slack.com/messages/C51E88VDG) cha

Issues are used as the primary method for tracking anything to do with the Helm project.

See the [contributing guide](https://github.com/kubernetes/helm/blob/master/CONTRIBUTING.md#issues)
See the [contributing guide](https://github.com/kubernetes/helm/blob/main/CONTRIBUTING.md#issues)
for information on how to [file an issue] if you think you have found a bug or have a feature request.

## Mailing lists
Expand Down
12 changes: 6 additions & 6 deletions helm-maintainers-onboarding-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Core maintainers take turns triaging the issue queue. The responsibilities of a
- If it violates the SemVer rules, mark it as `Upcoming - Major` and perhaps open a dialog on whether there is an alternate way to do this that will not break our SemVer rules
- If it is a major feature (new subcommand, new way of doing something), ask if it can be implemented as a plugin or extension

For information on tags and their meaning, see [The CONTRIBUTING.md](https://github.com/kubernetes/helm/blob/master/CONTRIBUTING.md#issues) for the project.
For information on tags and their meaning, see [The CONTRIBUTING.md](https://github.com/kubernetes/helm/blob/main/CONTRIBUTING.md#issues) for the project.

During your week of triaging, periodically scan back through known recent issues to see what has been updated.

Expand All @@ -132,7 +132,7 @@ If a PR passes the "Intent" and "Solves Problems" criteria above, we view our go

**SemVer Constraints:** Make sure a PR does not violate the SemVer constraints as explained above. This includes making sure API, ProtoBuf/gRPC, flags, commands, and formats remain compatible. Submitters often do not realize that their changes would break compatibility, so be extra gentle when explaining this.

**Coding Conventions/Idioms:** Our points of reference are [Effective Go](https://golang.org/doc/effective_go.html) and the [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments) in the Go Wiki. We follow Effective Go closely, and take the Go Code Review Comments as "decent guidelines".
**Coding Conventions/Idioms:** Our points of reference are [Effective Go](https://golang.org/doc/effective_go.html) and the [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments) in the Go Wiki. We follow Effective Go closely, and take the Go Code Review Comments as "decent guidelines".

We tend to avoid comments of the form "This works fine, but another way of doing it is..." unless the other way of doing it conveys clear advantage over the existing way.

Expand Down Expand Up @@ -165,17 +165,17 @@ Corresponding to SemVer, we have three different types of release:
- Minor: 2.1.0, 2.2.0, etc. Maintains compatibility per our SemVer rules above, but may add new features, fix bugs.
- Patch: 2.1.1, 2.1.2, etc. Maintains compatibility, adds no features, but fixes bugs.

Major releases and Minor releases are done by tagging `master` with the version number, and then running the release scripts.
Major releases and Minor releases are done by tagging `main` with the version number, and then running the release scripts.

Patch versions are done by a more complex process. They start from the `release-X.Y` branch and cherry-pick from `master`. A release branch is forked from the last minor release, and is then maintained in parallel with the master:
Patch versions are done by a more complex process. They start from the `release-X.Y` branch and cherry-pick from `main`. A release branch is forked from the last minor release, and is then maintained in parallel with the main:

```
---- v2.3.0 ---- Fix #1 --- Feature #2 --- Fix #3 --- ... [master]
---- v2.3.0 ---- Fix #1 --- Feature #2 --- Fix #3 --- ... [main]
\ \ \
release-2.3 ---- Fix #1 ------------- Fix #3 --- v2.3.1
```

Only fixes are pulled from `master` onto the `release-X.Y` branch. Features are not.
Only fixes are pulled from `main` onto the `release-X.Y` branch. Features are not.

#### Cherry-Picking

Expand Down

0 comments on commit 2c67972

Please sign in to comment.