Skip to content

Treat main branch as equivalent to master branch #265

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 3, 2024
Merged

Treat main branch as equivalent to master branch #265

merged 1 commit into from
Dec 3, 2024

Conversation

Rakshith-R
Copy link
Contributor

The new external-snapshot-metadata sidecar repository uses "main" instead of "master" as the development branch.
build.make is modified to treat both main and master branches the same.

refer: kubernetes-csi/external-snapshot-metadata#74

Signed-off-by: Rakshith R [email protected]

@Rakshith-R
Treat main branch as equivalent to master branch
3c8d966 
The new external-snapshot-metadata sidecar repository
uses "main" instead of "master" as the development
branch.
`build.make` is modified to treat both main and master
branches the same.

Signed-off-by: Rakshith R <[email protected]>
@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Nov 27, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 27, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @Rakshith-R!

It looks like this is your first PR to kubernetes-csi/csi-release-tools 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-csi/csi-release-tools has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 27, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @Rakshith-R. Thanks for your PR.

I'm waiting for a kubernetes-csi member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 27, 2024
@Rakshith-R
Copy link
Contributor Author

/cc @xing-yang

nixpanic
nixpanic reviewed Nov 28, 2024
View reviewed changes
Copy link
Member

@nixpanic nixpanic left a comment

Choose a reason for hiding this comment

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

/lgtm
/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Nov 28, 2024
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 28, 2024
@nixpanic
Copy link
Member

/unassign

@k8s-ci-robot
Copy link
Contributor

@Rakshith-R: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-csi-release-tools-csi-test 3c8d966 link false /test pull-kubernetes-csi-release-tools-csi-test

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jsafrane
Copy link
Contributor

jsafrane commented Dec 3, 2024

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, Rakshith-R

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 3, 2024
@jsafrane
Copy link
Contributor

jsafrane commented Dec 3, 2024

/release-note none

@jsafrane
Copy link
Contributor

jsafrane commented Dec 3, 2024

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 3, 2024
@k8s-ci-robot k8s-ci-robot merged commit 734c2b9 into kubernetes-csi:master Dec 3, 2024
6 of 7 checks passed
avorima added a commit to avorima/external-attacher that referenced this pull request Dec 5, 2024
@avorima
Squashed 'release-tools/' changes from 227577e0..734c2b95
d6713cf 
kubernetes-csi/csi-release-tools@734c2b95 Merge kubernetes-csi/csi-release-tools#265 from Rakshith-R/consider-main-branch
kubernetes-csi/csi-release-tools@f95c855b Merge kubernetes-csi/csi-release-tools#262 from huww98/golang-toolchain
kubernetes-csi/csi-release-tools@3c8d966f Treat main branch as equivalent to master branch
kubernetes-csi/csi-release-tools@e31de525 Merge kubernetes-csi/csi-release-tools#261 from huww98/golang
kubernetes-csi/csi-release-tools@fd153a9e Bump golang to 1.23.1
kubernetes-csi/csi-release-tools@a8b3d050 pull-test.sh: fix "git subtree pull" errors
kubernetes-csi/csi-release-tools@6b05f0fc use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
avorima added a commit to avorima/external-attacher that referenced this pull request Dec 5, 2024
@avorima
release-tools: update
bdaf628 
Commit summary:
Squashed 'release-tools/' changes from 227577e0..734c2b95

[734c2b95](kubernetes-csi/csi-release-tools@734c2b95) Merge [pull request kubernetes-csi#265](kubernetes-csi/csi-release-tools#265) from Rakshith-R/consider-main-branch
[f95c855b](kubernetes-csi/csi-release-tools@f95c855b) Merge [pull request kubernetes-csi#262](kubernetes-csi/csi-release-tools#262) from huww98/golang-toolchain
[3c8d966f](kubernetes-csi/csi-release-tools@3c8d966f) Treat main branch as equivalent to master branch
[e31de525](kubernetes-csi/csi-release-tools@e31de525) Merge [pull request kubernetes-csi#261](kubernetes-csi/csi-release-tools#261) from huww98/golang
[fd153a9e](kubernetes-csi/csi-release-tools@fd153a9e) Bump golang to 1.23.1
[a8b3d050](kubernetes-csi/csi-release-tools@a8b3d050) pull-test.sh: fix "git subtree pull" errors
[6b05f0fc](kubernetes-csi/csi-release-tools@6b05f0fc) use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
Signed-off-by: Mario Valderrama <[email protected]>
@avorima avorima mentioned this pull request Dec 5, 2024
Merged
avorima added a commit to avorima/external-provisioner that referenced this pull request Dec 5, 2024
@avorima
Squashed 'release-tools/' changes from 227577e00..734c2b950
50b084f 
kubernetes-csi/csi-release-tools@734c2b950 Merge kubernetes-csi/csi-release-tools#265 from Rakshith-R/consider-main-branch
kubernetes-csi/csi-release-tools@f95c855be Merge kubernetes-csi/csi-release-tools#262 from huww98/golang-toolchain
kubernetes-csi/csi-release-tools@3c8d966fe Treat main branch as equivalent to master branch
kubernetes-csi/csi-release-tools@e31de525b Merge kubernetes-csi/csi-release-tools#261 from huww98/golang
kubernetes-csi/csi-release-tools@fd153a9e2 Bump golang to 1.23.1
kubernetes-csi/csi-release-tools@a8b3d0504 pull-test.sh: fix "git subtree pull" errors
kubernetes-csi/csi-release-tools@6b05f0fcc use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
avorima added a commit to avorima/external-provisioner that referenced this pull request Dec 5, 2024
@avorima
release-tools: update
6bfe740 
Commit summary:
Squashed 'release-tools/' changes from 227577e00..734c2b950

[734c2b950](kubernetes-csi/csi-release-tools@734c2b950) Merge [pull request kubernetes-csi#265](kubernetes-csi/csi-release-tools#265) from Rakshith-R/consider-main-branch
[f95c855be](kubernetes-csi/csi-release-tools@f95c855be) Merge [pull request kubernetes-csi#262](kubernetes-csi/csi-release-tools#262) from huww98/golang-toolchain
[3c8d966fe](kubernetes-csi/csi-release-tools@3c8d966fe) Treat main branch as equivalent to master branch
[e31de525b](kubernetes-csi/csi-release-tools@e31de525b) Merge [pull request kubernetes-csi#261](kubernetes-csi/csi-release-tools#261) from huww98/golang
[fd153a9e2](kubernetes-csi/csi-release-tools@fd153a9e2) Bump golang to 1.23.1
[a8b3d0504](kubernetes-csi/csi-release-tools@a8b3d0504) pull-test.sh: fix "git subtree pull" errors
[6b05f0fcc](kubernetes-csi/csi-release-tools@6b05f0fcc) use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
Signed-off-by: Mario Valderrama <[email protected]>
@avorima avorima mentioned this pull request Dec 5, 2024
Merged
avorima added a commit to avorima/external-resizer that referenced this pull request Dec 5, 2024
@avorima
Squashed 'release-tools/' changes from 227577e0..734c2b95
5344947 
kubernetes-csi/csi-release-tools@734c2b95 Merge kubernetes-csi/csi-release-tools#265 from Rakshith-R/consider-main-branch
kubernetes-csi/csi-release-tools@f95c855b Merge kubernetes-csi/csi-release-tools#262 from huww98/golang-toolchain
kubernetes-csi/csi-release-tools@3c8d966f Treat main branch as equivalent to master branch
kubernetes-csi/csi-release-tools@e31de525 Merge kubernetes-csi/csi-release-tools#261 from huww98/golang
kubernetes-csi/csi-release-tools@fd153a9e Bump golang to 1.23.1
kubernetes-csi/csi-release-tools@a8b3d050 pull-test.sh: fix "git subtree pull" errors
kubernetes-csi/csi-release-tools@6b05f0fc use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
avorima added a commit to avorima/external-resizer that referenced this pull request Dec 5, 2024
@avorima
release-tools: update
b39abbc 
Commit summary:
Squashed 'release-tools/' changes from 227577e0..734c2b95

[734c2b95](kubernetes-csi/csi-release-tools@734c2b95) Merge [pull request kubernetes-csi#265](kubernetes-csi/csi-release-tools#265) from Rakshith-R/consider-main-branch
[f95c855b](kubernetes-csi/csi-release-tools@f95c855b) Merge [pull request kubernetes-csi#262](kubernetes-csi/csi-release-tools#262) from huww98/golang-toolchain
[3c8d966f](kubernetes-csi/csi-release-tools@3c8d966f) Treat main branch as equivalent to master branch
[e31de525](kubernetes-csi/csi-release-tools@e31de525) Merge [pull request kubernetes-csi#261](kubernetes-csi/csi-release-tools#261) from huww98/golang
[fd153a9e](kubernetes-csi/csi-release-tools@fd153a9e) Bump golang to 1.23.1
[a8b3d050](kubernetes-csi/csi-release-tools@a8b3d050) pull-test.sh: fix "git subtree pull" errors
[6b05f0fc](kubernetes-csi/csi-release-tools@6b05f0fc) use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
Signed-off-by: Mario Valderrama <[email protected]>
@avorima avorima mentioned this pull request Dec 5, 2024
Merged
avorima added a commit to avorima/node-driver-registrar that referenced this pull request Dec 5, 2024
@avorima
Squashed 'release-tools/' changes from 227577e0..734c2b95
bcb7b92 
kubernetes-csi/csi-release-tools@734c2b95 Merge kubernetes-csi/csi-release-tools#265 from Rakshith-R/consider-main-branch
kubernetes-csi/csi-release-tools@f95c855b Merge kubernetes-csi/csi-release-tools#262 from huww98/golang-toolchain
kubernetes-csi/csi-release-tools@3c8d966f Treat main branch as equivalent to master branch
kubernetes-csi/csi-release-tools@e31de525 Merge kubernetes-csi/csi-release-tools#261 from huww98/golang
kubernetes-csi/csi-release-tools@fd153a9e Bump golang to 1.23.1
kubernetes-csi/csi-release-tools@a8b3d050 pull-test.sh: fix "git subtree pull" errors
kubernetes-csi/csi-release-tools@6b05f0fc use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
avorima added a commit to avorima/node-driver-registrar that referenced this pull request Dec 5, 2024
@avorima
release-tools: update
01c7e28 
Commit summary:
Squashed 'release-tools/' changes from 227577e0..734c2b95

[734c2b95](kubernetes-csi/csi-release-tools@734c2b95) Merge [pull request kubernetes-csi#265](kubernetes-csi/csi-release-tools#265) from Rakshith-R/consider-main-branch
[f95c855b](kubernetes-csi/csi-release-tools@f95c855b) Merge [pull request kubernetes-csi#262](kubernetes-csi/csi-release-tools#262) from huww98/golang-toolchain
[3c8d966f](kubernetes-csi/csi-release-tools@3c8d966f) Treat main branch as equivalent to master branch
[e31de525](kubernetes-csi/csi-release-tools@e31de525) Merge [pull request kubernetes-csi#261](kubernetes-csi/csi-release-tools#261) from huww98/golang
[fd153a9e](kubernetes-csi/csi-release-tools@fd153a9e) Bump golang to 1.23.1
[a8b3d050](kubernetes-csi/csi-release-tools@a8b3d050) pull-test.sh: fix "git subtree pull" errors
[6b05f0fc](kubernetes-csi/csi-release-tools@6b05f0fc) use new GOTOOLCHAIN env to manage go version

git-subtree-dir: release-tools
git-subtree-split: 734c2b950c4b31f64b63052c64ffa5929d1c9b97
Signed-off-by: Mario Valderrama <[email protected]>
@avorima avorima mentioned this pull request Dec 5, 2024
Merged
@Rakshith-R Rakshith-R mentioned this pull request Dec 19, 2024
Closed
11 tasks
@Rakshith-R Rakshith-R mentioned this pull request Mar 4, 2025
Open
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nixpanic nixpanic nixpanic left review comments

@carlory carlory Awaiting requested review from carlory

@humblec humblec Awaiting requested review from humblec

@xing-yang xing-yang Awaiting requested review from xing-yang

Assignees

@jsafrane jsafrane

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Rakshith-R @k8s-ci-robot @nixpanic @jsafrane