Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helm: update changlog and notes #2897

Merged
merged 3 commits into from
Sep 6, 2022
Merged

Helm: update changlog and notes #2897

merged 3 commits into from
Sep 6, 2022

Conversation

krajorama
Copy link
Contributor

What this PR does

Update helm changelog after release branch merge to main.
Also add important note about people needing to pay attention to CHANGELOG.

Which issue(s) this PR fixes or relates to

Checklist

  • [N/A] Tests updated
  • [N/A] Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

The release branch has been merged back with rc0.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama added the helm label Sep 6, 2022
@krajorama krajorama changed the title Krajo/20220906 helm rc0 Helm: update changlog and notes Sep 6, 2022
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but this also affects the mimir changelog and the release notes. I think we should make the release shepherd @treid314 aware

always to Always
CHANGELOG.md to CHANGELOG.md file

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama merged commit ed68eb0 into main Sep 6, 2022
@krajorama krajorama deleted the krajo/20220906-helm-rc0 branch September 6, 2022 13:02
@grafanabot
Copy link
Contributor

The backport to release-2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2897-to-release-2.3 origin/release-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ed68eb059984b4724aa4f6cef7c6e099076e277d
# Push it to GitHub
git push --set-upstream origin backport-2897-to-release-2.3
git switch main
# Remove the local backport branch
git branch -D backport-2897-to-release-2.3

Then, create a pull request where the base branch is release-2.3 and the compare/head branch is backport-2897-to-release-2.3.

krajorama added a commit that referenced this pull request Sep 8, 2022
* Helm: move recent changelog entries to release 3.1

Main has been merged into the release-2.3 branch.

* Helm: note about importance of CHANGELOG

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
krajorama added a commit that referenced this pull request Sep 8, 2022
* Helm: move recent changelog entries to release 3.1

Main has been merged into the release-2.3 branch.

* Helm: note about importance of CHANGELOG

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants