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

🌱 prepare main branch for v1.5 development #8430

Merged
merged 1 commit into from
Apr 5, 2023

Conversation

joekr
Copy link
Member

@joekr joekr commented Mar 31, 2023

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):
Fixes #

Part of #8429

@k8s-ci-robot k8s-ci-robot added the area/clusterctl Issues or PRs related to clusterctl label Mar 31, 2023
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 31, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 31, 2023
@joekr
Copy link
Member Author

joekr commented Mar 31, 2023

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

Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

@joekr thanks for opening this PR

from a quick look to failures in docker.yaml we need to bump also test extension (line 284 in the file before this PR), creating one entry for v1.4.0 fetching from release and renaming the current entry to 1.5.99

Now, there will be an issue probably, because we are not publishing manifests for the test extension yet, so we have to think a little bit about how to solve this (the easiest way is to fixup the release machinery and publish it ex-post).
@killianmuldoon @ykakarap opinions?

@killianmuldoon
Copy link
Contributor

killianmuldoon commented Mar 31, 2023

#8438
Adds the target to the release. We could manually add a the manifest to v1.4.0 as an oversight, or we could wait to include it in v1.4.1 - thoughts @fabriziopandini @joekr ?

@fabriziopandini
Copy link
Member

I will add runtime-extension-components-development.yaml to the 1.4.0 release, the sooner we get this PR merged, the better

@joekr
Copy link
Member Author

joekr commented Mar 31, 2023

retesting after the last push.

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

@killianmuldoon
Copy link
Contributor

You also need to update the clusterctl_upgrade_test.go with the correct versions e.g. - https://github.com/kubernetes-sigs/cluster-api/pull/8420/files#diff-a5ba4f7f8baf6fc4eabea488d3a79a7b9c6f56457783f2422aab591fce31bfd4

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 31, 2023
@joekr
Copy link
Member Author

joekr commented Mar 31, 2023

I ran GINKGO_FOCUS="When testing clusterctl upgrades (v1.2=>current)" ./scripts/ci-e2e.sh locally and it passed. So lets give it a try now.

@joekr
Copy link
Member Author

joekr commented Mar 31, 2023

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

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/retest

Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

Thanks for the PR, few suggestions inline:

Looks like, it is missing a Makefile target update here and a copy of this for v1.4.

test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
@joekr joekr force-pushed the bump-versions-v1.5 branch 2 times, most recently from 6a4c36f to 624a7e3 Compare April 3, 2023 13:41
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 3, 2023
@killianmuldoon
Copy link
Contributor

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

1 similar comment
@killianmuldoon
Copy link
Contributor

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

@killianmuldoon
Copy link
Contributor

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

@joekr
Copy link
Member Author

joekr commented Apr 3, 2023

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

@killianmuldoon
Copy link
Contributor

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

@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-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-full-main
  • /test pull-cluster-api-e2e-informing-ipv6-main
  • /test pull-cluster-api-e2e-informing-main
  • /test pull-cluster-api-e2e-scale-main-experimental
  • /test pull-cluster-api-e2e-workload-upgrade-1-26-latest-main

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-informing-ipv6-main
  • pull-cluster-api-e2e-informing-main
  • pull-cluster-api-e2e-main
  • pull-cluster-api-test-main
  • pull-cluster-api-test-mink8s-main
  • pull-cluster-api-verify-main

In response to this:

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

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.

@killianmuldoon
Copy link
Contributor

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

@joekr
Copy link
Member Author

joekr commented Apr 4, 2023

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

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/lgtm

@fabriziopandini for final approval.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5fce735c9667869faef2cd62c41ec7503f368142

test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
test/e2e/config/docker.yaml Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2023
Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

Thanks @joekr for working on this!

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6e98b1fbfe7f1ddc3ec2d9e4f11489f08176bca2

@fabriziopandini
Copy link
Member

final check
/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-informing-ipv6-main
/test pull-cluster-api-e2e-informing-main
/test pull-cluster-api-e2e-workload-upgrade-1-26-latest-main

@fabriziopandini
Copy link
Member

@joekr awesome job!
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 Apr 5, 2023
@k8s-ci-robot k8s-ci-robot merged commit 29794ea into kubernetes-sigs:main Apr 5, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Apr 5, 2023
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. area/clusterctl Issues or PRs related to clusterctl 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
Development

Successfully merging this pull request may close these issues.

5 participants