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

Release v1.3.5 #601

Merged
merged 2 commits into from
Dec 10, 2021
Merged

Release v1.3.5 #601

merged 2 commits into from
Dec 10, 2021

Conversation

wongma7
Copy link
Contributor

@wongma7 wongma7 commented Dec 10, 2021

Is this a bug fix or adding new feature?

What is this PR about? / Why do we need it? merging #599 and #600 back into master branch following https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/docs/RELEASE.md#merge-the-release-and-post-release-commits-to-the-main-branch

What testing is done?

@linux-foundation-easycla
Copy link

CLA Not Signed

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 10, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wongma7

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 10, 2021
@@ -1,8 +1,11 @@
# Helm chart

# v2.2.1
# master (unreleased)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

conflict had to be resolved here.

for the efs repo, unlike fsx and ebs, the helm canonical source of helm chart is the release branch. So if a helm chart is edited in master branch it isn't actually released unless the change is backported to the release branch. In separate PRs, I'll backport the "Add controller.volMetricsOptIn for emitting volume metrics" change to release branch and then reconcile release and master branch.

The reason for this is because I found during dynamic provisioning release there was a long time between when helm chart was changed and when we could actually release it so it made sense to branch the helm chart to keep it isolated from master branch. Not sure if it's worth continuing this pattern though

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wongma7 wongma7 changed the title Master135 Release v1.3.5 Dec 10, 2021
@wongma7
Copy link
Contributor Author

wongma7 commented Dec 10, 2021

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 10, 2021
@nckturner
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 10, 2021
@wongma7
Copy link
Contributor Author

wongma7 commented Dec 10, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 10, 2021
@k8s-ci-robot k8s-ci-robot merged commit 9a4bef2 into kubernetes-sigs:master Dec 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants