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

🌱 test/e2e: Extend ClusterClass changes test to cover InfrastructureMachineTemplate rotation #7134

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Aug 30, 2022

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
This PR extends the ClusterClass changes e2e test to cover InfrastructureMachineTemplate rotation. This makes it easy to test if the webhook change for ClusterClass SSA has been implemented correctly.

xref: https://cluster-api.sigs.k8s.io/developer/providers/v1.1-to-v1.2.html#required-api-changes-for-providers (2nd point)

I would like to cherry-pick this in to release-1.2 to make it directly available to providers adopting CAPI v1.2

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 #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 30, 2022
@sbueringer sbueringer changed the title test/e2e: Extend ClusterClass changes test to cover InfrastructureMachineTemplate rotation 🌱 test/e2e: Extend ClusterClass changes test to cover InfrastructureMachineTemplate rotation Aug 30, 2022
@sbueringer
Copy link
Member Author

cc @killianmuldoon

@sbueringer
Copy link
Member Author

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

@sedefsavas
Copy link

LGTM

InfrastructureMachineTemplate rotation

Signed-off-by: Stefan Büringer [email protected]
@sbueringer sbueringer force-pushed the pr-extend-clusterclasschanges-test branch from 8663365 to 111a268 Compare August 31, 2022 10:30
@srm09
Copy link
Contributor

srm09 commented Aug 31, 2022

/lgtm

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

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

Should actually run the test.. :)

@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 Aug 31, 2022
@sbueringer
Copy link
Member Author

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.2

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 f9e624a into kubernetes-sigs:main Aug 31, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Aug 31, 2022
@k8s-infra-cherrypick-robot

@sbueringer: #7134 failed to apply on top of branch "release-1.2":

Applying: test/e2e: Extend ClusterClass changes test to cover InfrastructureMachineTemplate rotation
Using index info to reconstruct a base tree...
M	test/e2e/clusterclass_changes.go
M	test/e2e/clusterclass_changes_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/clusterclass_changes_test.go
Auto-merging test/e2e/clusterclass_changes.go
CONFLICT (content): Merge conflict in test/e2e/clusterclass_changes.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test/e2e: Extend ClusterClass changes test to cover InfrastructureMachineTemplate rotation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.2

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.

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

Successfully merging this pull request may close these issues.

6 participants