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

🌱 Prep main branch for v1.7 development #9799

Merged
merged 1 commit into from
Dec 15, 2023
Merged

🌱 Prep main branch for v1.7 development #9799

merged 1 commit into from
Dec 15, 2023

Conversation

cahillsf
Copy link
Member

@cahillsf cahillsf commented Dec 3, 2023 •
edited
Loading

What this PR does / why we need it:
This PR prepares the main branch for development.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Part of: #9800

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 3, 2023
@cahillsf cahillsf force-pushed the prep-main-branch-v1.7 branch from 818f798 to d553739 Compare December 3, 2023 21:31
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 3, 2023
@cahillsf
Copy link
Member Author

cahillsf commented Dec 3, 2023

/area release

@k8s-ci-robot k8s-ci-robot added area/release Issues or PRs related to releasing and removed do-not-merge/needs-area PR is missing an area label labels Dec 3, 2023
@cahillsf cahillsf mentioned this pull request Dec 3, 2023
Closed
30 tasks
sbueringer
sbueringer reviewed Dec 4, 2023
View reviewed changes
Makefile Show resolved Hide resolved
@cahillsf cahillsf changed the title Prep main branch v1.7 🌱 Prep main branch for v1.7 development Dec 9, 2023
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 9, 2023
cahillsf

This comment was marked as duplicate.

Sign in to view

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 9, 2023
@cahillsf
Copy link
Member Author

cahillsf commented Dec 9, 2023

/test ?

@k8s-ci-robot
Copy link
Contributor

@cahillsf: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-full-dualstack-and-ipv6-main
  • /test pull-cluster-api-e2e-full-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main
  • /test pull-cluster-api-e2e-scale-main-experimental

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test ?

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.

@cahillsf
Copy link
Member Author

cahillsf commented Dec 9, 2023

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main

@cahillsf cahillsf marked this pull request as ready for review December 9, 2023 04:24
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 9, 2023
@cahillsf cahillsf force-pushed the prep-main-branch-v1.7 branch from 408b2ad to 86c36e8 Compare December 10, 2023 02:04
@sbueringer
Copy link
Member

/approve

/hold
(for squash)

@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 14, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 14, 2023
@chrischdi
Copy link
Member

/tide merge-method-squash

@chrischdi
Copy link
Member

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Dec 14, 2023
@chrischdi
Copy link
Member

/unlabel tide/merge-method-squash

@chrischdi
Copy link
Member

/remove tide/merge-method-squash

@chrischdi
Copy link
Member

/remove-label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot removed the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Dec 14, 2023
@chrischdi
Copy link
Member

@cahillsf : I don't want to push pressure, but it would be helpful to get this rebased and squashed so we can merge it. This then would unblock work on k8s v1.29 :-)

@cahillsf
Copy link
Member Author

yep np @chrischdi its on my list, US workday coming to a close soon will squash as soon as i have a spare moment

@cahillsf cahillsf force-pushed the prep-main-branch-v1.7 branch from 7b35adb to 901219f Compare December 14, 2023 21:53
@cahillsf cahillsf force-pushed the prep-main-branch-v1.7 branch from 901219f to f15e876 Compare December 14, 2023 21:55
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 14, 2023
@cahillsf
Copy link
Member Author

cahillsf commented Dec 14, 2023 •
edited
Loading

@chrischdi just squashed and rebased, hopefully the tests will pass. does need another lgtm though 😄

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 14, 2023
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-full-main

@sbueringer
Copy link
Member

/lgtm

/hold cancel

Should now merge after tests

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 15, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c2efcf896fbeb5eb8272014df7f190e66c8b6200

@sbueringer
Copy link
Member

Thx @cahillsf !!

@k8s-ci-robot k8s-ci-robot merged commit 32b2f3d into kubernetes-sigs:main Dec 15, 2023
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Dec 15, 2023
@adilGhaffarDev adilGhaffarDev mentioned this pull request Dec 16, 2023
Closed
@sbueringer sbueringer mentioned this pull request Dec 18, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hackeramitkumar hackeramitkumar Awaiting requested review from hackeramitkumar

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@Jont828 Jont828 Awaiting requested review from Jont828

@Prajyot-Parab Prajyot-Parab Awaiting requested review from Prajyot-Parab

@chrischdi chrischdi Awaiting requested review from chrischdi

@sbueringer sbueringer Awaiting requested review from sbueringer

Assignees

@chrischdi chrischdi

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release Issues or PRs related to releasing 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
5 participants
@cahillsf @k8s-ci-robot @sbueringer @adilGhaffarDev @chrischdi