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

chore: Backport allow annotation on MachinePool to set externally managed to release-1.5 #4171

Merged
merged 2 commits into from
Apr 5, 2023

Conversation

tasdikrahman
Copy link
Contributor

@tasdikrahman tasdikrahman commented Mar 24, 2023

chore: Backport allow annotation on MachinePool to set externally managed to release-1.5 #3683

Add one of the following kinds:
/kind feature

What this PR does / why we need it:

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

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

Release note:

allow annotation on MachinePool to set externally managed 

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 24, 2023
@k8s-ci-robot k8s-ci-robot added needs-priority needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 24, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @tasdikrahman. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 24, 2023
@Ankitasw
Copy link
Member

cc @richardcase @Skarlso

@Skarlso
Copy link
Contributor

Skarlso commented Mar 29, 2023

Yo @tasdikrahman. Can you please update the description and add release notes? Cheers.

@Ankitasw
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 31, 2023
@tasdikrahman
Copy link
Contributor Author

I ended up removing these two mock calls https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/release-1.6/pkg/cloud/services/interfaces.go#L64-L65 which are present on release1.6. the tests pass locally. Let me know if you would like to change something else folks. Sorry I missed out the release notes in the original PR description, thanks for adding it @Ankitasw

@tasdikrahman
Copy link
Contributor Author

noticed that it's failing on the e2e test with this

[1]     Should create a workload cluster [It]
[1]     /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/test@v1.1.5/e2e/quick_start.go:77
[1] 
[1]     Timed out after 1500.000s.
              
[1]     Expected
[1]         <bool>: false
[1]     to be true

https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/4171/pull-cluster-api-provider-aws-e2e-blocking-release-1-5/1642836389806477312 from this build

was thinking if we should resubmit the e2e.

@Ankitasw
Copy link
Member

Ankitasw commented Apr 3, 2023

/test pull-cluster-api-provider-aws-e2e-blocking-release-1-5

@Ankitasw
Copy link
Member

Ankitasw commented Apr 4, 2023

This should fix it.

@Ankitasw
Copy link
Member

Ankitasw commented Apr 4, 2023

@tasdikrahman could you please rebase your PR?

@Ankitasw Ankitasw added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Apr 5, 2023
@Ankitasw
Copy link
Member

Ankitasw commented Apr 5, 2023

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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 6a15755 into kubernetes-sigs:release-1.5 Apr 5, 2023
@tasdikrahman tasdikrahman deleted the release-1.5 branch April 5, 2023 07:09
@tasdikrahman
Copy link
Contributor Author

Just putting the backtracking here for reference in case someone checks how the above PR fixes the e2e tests.

The conf file is passed here in the e2e test

and then picked up by the capa-controller-manager here in the deployment config for the same with the feature gate EventBridgeInstanceState, which then enables the AWSInstanceStateController here

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. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants