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

📖 Add release task about removing unsupported release version of CAPI #9487

Merged
merged 1 commit into from
Oct 19, 2023
Merged

📖 Add release task about removing unsupported release version of CAPI #9487

merged 1 commit into from
Oct 19, 2023

Conversation

chiukapoor
Copy link
Contributor

Part of the Improvement tasks for the v1.6 release cycle #9104

What this PR does / why we need it:

  • Add release task about removing unsupported release version of CAPI

Which issue(s) this PR fixes
Fixes #9485

/kind documentation
/area release

@k8s-ci-robot k8s-ci-robot added kind/documentation Categorizes issue or PR as related to documentation. area/release Issues or PRs related to releasing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 24, 2023
killianmuldoon
killianmuldoon reviewed Sep 25, 2023
View reviewed changes
docs/release/release-tasks.md Outdated
@@ -120,6 +120,7 @@ This comes down to changing occurrences of the old version to the new version, e
Please note that both `InitWithKubernetesVersion` and `WorkloadKubernetesVersion` should be the highest mgmt cluster version supported by the respective Cluster API version.
2. Update `create-local-repository.py` and `tools/internal/tilt-prepare/main.go`: `v1.4.99` => `v1.5.99`.
3. Make sure all tests are green (also run `pull-cluster-api-e2e-full-main` and `pull-cluster-api-e2e-workload-upgrade-1-23-latest-main`).
4. Remove unsupported release version of Cluster API. For example remove `v1.3` while working on `v1.6`.
Copy link
Contributor

Choose a reason for hiding this comment

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

This is already covered under L~546. Similar to #9486 is the idea here to move responsibility of this from the CI lead to the release lead?

Copy link
Contributor Author

@chiukapoor chiukapoor Sep 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This needs to be checked with @furkatgofurov7, I will wait for his response as he is out on a vacation.

Copy link
Member

Choose a reason for hiding this comment

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

This is already covered under L~546. Similar to #9486 is the idea here to move responsibility of this from the CI lead to the release lead?

@killianmuldoon this has to be under the RL responsibilities and part of the steps working on preparing the main branch work, as we need to remove makefile target to generate e2e templates for unsupported release branch. Maybe we could clarify it a bit in the notes if that was not clear?

Copy link
Contributor

Choose a reason for hiding this comment

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

I definitely think clarifying this is a good idea. This is the line in the CI tasks I was talking about:

Remove tests for old release branches according to our policy documented in Support and guarantees For example, let's assume we just created tests for v1.4, then we can now drop test coverage for the release-1.1 branch.

Maybe that should be clarified to only refer to the test-infra test config?

Copy link
Member

@furkatgofurov7 furkatgofurov7 Sep 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe that should be clarified to only refer to the test-infra test config?

Agree, it has 2 parts: changes needed in CAPI code base & test-infra repo, and above line refers to the latter. In that case, we could:

  • leave the current notes in this PR where it is now but clarify that the Makefile target for the old branch has to be removed
  • clarify the notes from CI tasks that it only refers to the test-infra repo changes

WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds good!

Copy link
Member

Choose a reason for hiding this comment

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

@chiukapoor can you please update the PR accordingly?

@furkatgofurov7 furkatgofurov7 mentioned this pull request Oct 13, 2023
Closed
35 tasks
furkatgofurov7
furkatgofurov7 reviewed Oct 16, 2023
View reviewed changes
docs/release/release-tasks.md Outdated
@@ -120,6 +120,7 @@ This comes down to changing occurrences of the old version to the new version, e
Please note that both `InitWithKubernetesVersion` and `WorkloadKubernetesVersion` should be the highest mgmt cluster version supported by the respective Cluster API version.
2. Update `create-local-repository.py` and `tools/internal/tilt-prepare/main.go`: `v1.4.99` => `v1.5.99`.
3. Make sure all tests are green (also run `pull-cluster-api-e2e-full-main` and `pull-cluster-api-e2e-workload-upgrade-1-23-latest-main`).
4. Remove unsupported release version of Cluster API. For example remove `v1.3` while working on `v1.6`.
Copy link
Member

@furkatgofurov7 furkatgofurov7 Oct 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
4. Remove unsupported release version of Cluster API. For example remove `v1.3` while working on `v1.6`.
4. Remove an unsupported release version of Cluster API from the Makefile target that generates e2e templates. For example, remove `v1.3` while working on `v1.6`.

Copy link
Member

Choose a reason for hiding this comment

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

@chiukapoor we also need to change notes for CI manager tasks from:

Remove tests for old release branches according to our policy documented in [Support and guarantees](https://github.com/chiukapoor/cluster-api/blob/issue-9485/CONTRIBUTING.md#support-and-guarantees) For example, let's assume we just created tests for v1.4, then we can now drop test coverage for the release-1.1 branch.

to:

Remove tests from the test-infra repository for old release branches according to our policy documented in [Support and guarantees](https://github.com/chiukapoor/cluster-api/blob/issue-9485/CONTRIBUTING.md#support-and-guarantees). For example, let's assume we just created tests for v1.4, then we can now drop test coverage for the release-1.1 branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Inculcating the changes

@chiukapoor
Add release task about removing unsupported release version of CAPI |…
e4b1f7e 
… Update test removal task of CI team

Signed-off-by: Chirayu Kapoor <[email protected]>
furkatgofurov7
furkatgofurov7 approved these changes Oct 18, 2023
View reviewed changes
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 @chiukapoor!

/approve
cc @killianmuldoon PTAL when you have time 🙂

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: furkatgofurov7

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 Oct 18, 2023
killianmuldoon
killianmuldoon reviewed Oct 19, 2023
View reviewed changes
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.

Thanks!

/lgtm

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

LGTM label has been added.

Git tree hash: aaaf4ca744c72f239e02ded708f36d5d93e747b5

@k8s-ci-robot k8s-ci-robot merged commit 58ccfc6 into kubernetes-sigs:main Oct 19, 2023
13 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Oct 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@furkatgofurov7 furkatgofurov7 furkatgofurov7 approved these changes

@hackeramitkumar hackeramitkumar Awaiting requested review from hackeramitkumar

@nprokopic nprokopic Awaiting requested review from nprokopic

Assignees

@killianmuldoon killianmuldoon

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. kind/documentation Categorizes issue or PR as related to documentation. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

Release Team: Add release tasks about removing unsupported release version of CAPI
4 participants
@chiukapoor @k8s-ci-robot @furkatgofurov7 @killianmuldoon