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

🌱 Bump versions for v1.2 #5982

Merged
merged 2 commits into from
Feb 3, 2022
Merged

🌱 Bump versions for v1.2 #5982

merged 2 commits into from
Feb 3, 2022

Conversation

alexander-demicev
Copy link
Contributor

@alexander-demicev alexander-demicev commented Jan 25, 2022 •
edited
Loading

What this PR does / why we need it:

Add v1.2 to metadata.yaml since there is already release-1.1 branch.

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 #6020

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 25, 2022
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 25, 2022
fabriziopandini
fabriziopandini reviewed Jan 25, 2022
View reviewed changes
metadata.yaml
Comment on lines +9 to +11
- major: 1
minor: 2
contract: v1beta1
Copy link
Member

Choose a reason for hiding this comment

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

@sbueringer do we need to have the same change in test/e2e/data/shared/v1beta1/metadata.yaml too?

Copy link
Member

@sbueringer sbueringer Jan 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Yes.

We need a few more changes in test data, but I think some of them would be better done after the v1.1 release.

But I think it's a good idea to keep the metadata.yaml in sync in this PR (and we can do & merge that now).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've just updated metadata in e2e, can you take a look?

Copy link
Member

Choose a reason for hiding this comment

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

Looks perfect!

Copy link
Member

@sbueringer sbueringer Jan 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I have to correct myself. Looking at CI it seems like our tests are now trying to use a v1.2 version which doesn't exist (in the docker.yaml and on GitHub).

I think we can either:

  • only adjust the top-level metadata.yaml in this PR
  • adjust both metadata.yamls and the docker.yaml in the same PR. For the docker.yaml we would ~ adjust the providers array like this:
    • switch v1.1.99 to a released version of CAPI
    • add v1.2.99

I think option 2. makes the most sense after the v1.1.0 release. I think we're not in a rush so maybe we should just do it all in one PR (we can prepare that now) and then /hold until next week. This could also include changes like updating the version in create-local-repository.py and tilt-prepare/main.go.

Another advantage is that we would group the changes a bit more, so it's easier to refer to for the next release.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, looks like CI won't be happy until 1.1 is released. Let's hold the PR until next week.

Copy link
Member

Choose a reason for hiding this comment

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

+1 make a bulk of all the changes above

Copy link
Member

Choose a reason for hiding this comment

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

I'll open an issue hopeful until EOW which captures/summarizes what we want to do. @alexander-demichev I'll mention you on it.

@alexander-demicev
Copy link
Contributor Author

/hold
we should wait for v.1.1 release

@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 Jan 25, 2022
@sbueringer sbueringer mentioned this pull request Jan 28, 2022
Closed
17 tasks
@vincepri
Copy link
Member

We should be able to merge this now that we have the 1.1 release branch

@sbueringer
Copy link
Member

We should be able to merge this now that we have the 1.1 release branch

In theory yes, in practice this change breaks CI when we keep the test metadata.yaml in sync.

This PR will be extended to implemented this entire issue: #6020 after the v1.1.0 release.

We could implement it partially already, but it's probably not worth having the repo in an inconsistent state for a few days.

@alexander-demicev
Copy link
Contributor Author

/unhold

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 3, 2022
@alexander-demicev
Copy link
Contributor Author

@fabriziopandini @sbueringer I updated this PR.

@sbueringer
Copy link
Member

Thx!

/retitle 🌱 Bump versions for v1.2

/lgtm
/assign @fabriziopandini

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

Let's wait for the test results before merge (there's a clusterctl upgrade test in e2e-full-main)

@k8s-ci-robot k8s-ci-robot changed the title 🌱Add v1.2 to metadata 🌱 Bump versions for v1.2 Feb 3, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 3, 2022
@sbueringer
Copy link
Member

@alexander-demichev Can you please update the PR description to contain Fixes #6020? Thx!

vincepri
vincepri approved these changes Feb 3, 2022
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 Feb 3, 2022
@k8s-ci-robot k8s-ci-robot merged commit 57d76ff into kubernetes-sigs:main Feb 3, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.2 milestone Feb 3, 2022
@alexander-demicev alexander-demicev deleted the metadata branch February 4, 2022 16:25
@ykakarap ykakarap mentioned this pull request Jun 9, 2022
Closed
23 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@sbueringer sbueringer sbueringer left review comments

@vincepri vincepri vincepri approved these changes

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.

Prepare main branch for v1.2 development
5 participants
@alexander-demicev @vincepri @sbueringer @k8s-ci-robot @fabriziopandini