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

🌱 e2e: add init versions for providers #7628

Merged
merged 1 commit into from
Nov 30, 2022
Merged

🌱 e2e: add init versions for providers #7628

merged 1 commit into from
Nov 30, 2022

Conversation

lentzi90
Copy link
Contributor

What this PR does / why we need it:

Support specifying the initial versions for providers in the e2e clusterctl upgrade test.

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

@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. labels Nov 25, 2022
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 25, 2022
@lentzi90
Copy link
Contributor Author

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

@lentzi90 lentzi90 force-pushed the lentzi90/e2e-clusterctl-upgrade-init-versions branch from 4cba044 to 2dd9751 Compare November 28, 2022 08:01
@lentzi90
Copy link
Contributor Author

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

@lentzi90 lentzi90 force-pushed the lentzi90/e2e-clusterctl-upgrade-init-versions branch from 2dd9751 to 2461425 Compare November 28, 2022 10:27
@lentzi90 lentzi90 changed the title WIP: 🌱 e2e: add init versions for providers 🌱 e2e: add init versions for providers Nov 28, 2022
@lentzi90 lentzi90 marked this pull request as ready for review November 28, 2022 10:28
@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 Nov 28, 2022
@sbueringer
Copy link
Member

/retest

(GitHub rate limit when retrieving cert-manager YAML)

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

sbueringer
sbueringer reviewed Nov 28, 2022
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Thank you

Just some nits, otherwise fine for me

test/e2e/clusterctl_upgrade.go Outdated
Comment on lines 74 to 75
// InitWithCoreProvider can be used to override the INIT_WITH_CORE_PROVIDER e2e config variable with a specific core provider
// version to use when initializing the secondary management cluster, e.g. `cluster-api:v1.3.0`
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// InitWithCoreProvider can be used to override the INIT_WITH_CORE_PROVIDER e2e config variable with a specific core provider
// version to use when initializing the secondary management cluster, e.g. `cluster-api:v1.3.0`
// InitWithCoreProvider specifies the core provider version to use when initializing the secondary management cluster, e.g. `cluster-api:v1.3.0`.
// If not set, the core provider version is calculated based on the contract.

nit. same below (there is no INIT_WITH_CORE_PROVIDER)

Copy link
Member

Choose a reason for hiding this comment

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

Q: should we document these take precedence on InitWithProvidersContract? (same for the others)

test/e2e/clusterctl_upgrade.go Outdated Show resolved Hide resolved
test/e2e/clusterctl_upgrade.go Outdated Show resolved Hide resolved
@lentzi90 lentzi90 force-pushed the lentzi90/e2e-clusterctl-upgrade-init-versions branch from 2461425 to f870c4e Compare November 30, 2022 07:21
@lentzi90
Copy link
Contributor Author

Thank you for the reviews! I think I have addressed all comments now, PTAL 🙂

@lentzi90 lentzi90 requested review from sbueringer and fabriziopandini and removed request for JoelSpeed and sbueringer November 30, 2022 07:57
@lentzi90
Copy link
Contributor Author

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

1 similar comment
@sbueringer
Copy link
Member

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

@sbueringer
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2022
@sbueringer
Copy link
Member

/retest

@fabriziopandini
Copy link
Member

@lentzi90 thanks for helping us in making test framework more flexible!
/lgtm
(pending E2E signal for approval)

@sbueringer
Copy link
Member

/approve

@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 Nov 30, 2022
@sbueringer
Copy link
Member

sbueringer commented Nov 30, 2022 •
edited
Loading

/cherry-pick release-1.3

(but sorry won't make it into v1.3.0)

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.3

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 merged commit 86711a7 into kubernetes-sigs:main Nov 30, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Nov 30, 2022
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 30, 2022
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #7673

In response to this:

/cherry-pick release-1.3

(but sorry won't make it into v1.3.0)

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.

@lentzi90 lentzi90 deleted the lentzi90/e2e-clusterctl-upgrade-init-versions branch December 1, 2022 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

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.4
Development

Successfully merging this pull request may close these issues.

Framework: Support starting controller version in clusterctl upgrade tests
5 participants
@lentzi90 @k8s-ci-robot @sbueringer @fabriziopandini @k8s-infra-cherrypick-robot