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.

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

Rename image-builder default branch to main #29671

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Rename image-builder default branch to main #29671

merged 1 commit into from
Jun 22, 2023

Conversation

AverageMarcus
Copy link
Member

The image-builder project is planning to rename the default branch from master to main. This PR is in preparation for that happening as outlined in https://www.kubernetes.dev/resources/rename/.

Towards: kubernetes-sigs/image-builder#1161

/assign @mboersma @kkeshavamurthy @jsturtevant
/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 Jun 2, 2023
@k8s-ci-robot
Copy link
Contributor

@AverageMarcus: GitHub didn't allow me to assign the following users: kkeshavamurthy.

Note that only kubernetes members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

The image-builder project is planning to rename the default branch from master to main. This PR is in preparation for that happening as outlined in https://www.kubernetes.dev/resources/rename/.

Towards: kubernetes-sigs/image-builder#1161

/assign @mboersma @kkeshavamurthy @jsturtevant
/hold

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. area/config Issues or PRs related to code in /config labels Jun 2, 2023
@k8s-ci-robot k8s-ci-robot requested review from cpanato and dims June 2, 2023 08:22
@k8s-ci-robot k8s-ci-robot added area/jobs area/provider/gcp Issues or PRs related to gcp provider sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jun 2, 2023
@jsturtevant
Copy link
Contributor

is it possible to reference both master and main? that would make transition easier.

@AverageMarcus
Copy link
Member Author

Not as far as I was able to tell. There is an open issue about updating the tooling to allow just using the default branch but that isn’t in place yet. #20672

@mboersma
Copy link
Contributor

mboersma commented Jun 2, 2023 •
edited
Loading

Looks good, thanks!

We probably need to get merged #29667 first, so we maintainers can merge this ourselves. 😄 Edit: done.

@AverageMarcus
Copy link
Member Author

@mboersma We're still going to need approval from others as this PR is updating other projects jobs that make use of image-builder in their pipelines. Mainly just CAPI providers so we can reach out to them on Slack to get this approved (and remain on hold) before we do the rename.

@AverageMarcus AverageMarcus mentioned this pull request Jun 20, 2023
Closed
@richardcase
Copy link
Contributor

For CAPA & CAPG:

/approve

@AverageMarcus
Copy link
Member Author

@richardcase it doesn't look like you're listed in the OWNERS file for CAPG in test-infra 😞 - https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-gcp/OWNERS

cpanato
cpanato approved these changes Jun 20, 2023
View reviewed changes
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2023
lentzi90
lentzi90 approved these changes Jun 20, 2023
View reviewed changes
Copy link
Contributor

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

For CAPO
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 20, 2023
@AverageMarcus
Copy link
Member Author

Thanks everyone! Really appreciate your fast response!

This will now remain on hold until after we've completed the rename.

@AverageMarcus AverageMarcus force-pushed the image-builder-branch-rename branch from 5628fc6 to b72dfa0 Compare June 22, 2023 10:33
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 22, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AverageMarcus, cpanato, lentzi90, richardcase

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

@AverageMarcus
Copy link
Member Author

I had to rebase with some merged changes that altered the indentation. 😞

Would someone mind dropping a LGTM please? 🙏

@cpanato
Copy link
Member

cpanato commented Jun 22, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 22, 2023
@AverageMarcus
Copy link
Member Author

/unhold

Branch has been renamed

@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 Jun 22, 2023
@k8s-ci-robot k8s-ci-robot merged commit 0d91ede into kubernetes:master Jun 22, 2023
@k8s-ci-robot
Copy link
Contributor

@AverageMarcus: Updated the job-config configmap in namespace default at cluster test-infra-trusted using the following files:

  • key cluster-api-provider-aws-periodics-release-1.5.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-periodics-release-1.5.yaml
  • key cluster-api-provider-aws-periodics.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-periodics.yaml
  • key cluster-api-provider-aws-presubmits-release-1.5.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits-release-1.5.yaml
  • key cluster-api-provider-aws-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-aws/cluster-api-provider-aws-presubmits.yaml
  • key cluster-api-provider-gcp-periodics-main.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-gcp/cluster-api-provider-gcp-periodics-main.yaml
  • key cluster-api-provider-gcp-presubmits-main.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-gcp/cluster-api-provider-gcp-presubmits-main.yaml
  • key cluster-api-provider-gcp-presubmits-release-1-2.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-gcp/cluster-api-provider-gcp-presubmits-release-1-2.yaml
  • key cluster-api-provider-openstack-periodics.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-openstack/cluster-api-provider-openstack-periodics.yaml
  • key cluster-api-provider-openstack-postsubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-openstack/cluster-api-provider-openstack-postsubmits.yaml
  • key cluster-api-provider-openstack-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api-provider-openstack/cluster-api-provider-openstack-presubmits.yaml
  • key image-builder-periodics.yaml using file config/jobs/kubernetes/sig-k8s-infra/trusted/image-builder/image-builder-periodics.yaml

In response to this:

The image-builder project is planning to rename the default branch from master to main. This PR is in preparation for that happening as outlined in https://www.kubernetes.dev/resources/rename/.

Towards: kubernetes-sigs/image-builder#1161

/assign @mboersma @kkeshavamurthy @jsturtevant
/hold

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/test-infra repository.

@AverageMarcus AverageMarcus deleted the image-builder-branch-rename branch June 22, 2023 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lentzi90 lentzi90 lentzi90 approved these changes

@cpanato cpanato cpanato approved these changes

@dims dims Awaiting requested review from dims

Assignees

@mboersma mboersma

@jsturtevant jsturtevant

@cpanato cpanato

@lentzi90 lentzi90

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/jobs area/provider/gcp Issues or PRs related to gcp provider 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. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@AverageMarcus @k8s-ci-robot @jsturtevant @mboersma @richardcase @cpanato @lentzi90