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

🌱Add initial Rosa machine pool integration tests #5214

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

PanSpagetka
Copy link
Contributor

@PanSpagetka PanSpagetka commented Nov 12, 2024

What type of PR is this?
Adding tests. I am not sure what kind should apply so I am not applying any.,

What this PR does / why we need it:

Adding basic integration tests for ROSAMachinePoolReconciler. One test case for creating new machine pool and for deleting.

To be able to mock OCM and STS calls I had to do small refactoring.

Checklist:

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

Release note:

NONE

@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. release-note-none Denotes a PR that doesn't merit a release note. labels Nov 12, 2024
Copy link

linux-foundation-easycla bot commented Nov 12, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: PanSpagetka / name: Robin Knaur (b926856)

@k8s-ci-robot k8s-ci-robot added needs-priority needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 12, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @PanSpagetka!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 12, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @PanSpagetka. 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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 12, 2024
@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch from 9e2fe4e to 2ce8f3d Compare November 12, 2024 09:49
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 12, 2024
@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch from 2ce8f3d to abce607 Compare November 12, 2024 10:03
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 2024
@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch 3 times, most recently from f2c32f1 to abd21bc Compare November 18, 2024 10:38
@PanSpagetka PanSpagetka changed the title WIP: 🌱Add initial Rosa machine pool integration tests 🌱Add initial Rosa machine pool integration tests Nov 18, 2024
@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 18, 2024
@serngawy
Copy link
Contributor

@nrb would you add ok-to-test

main.go Outdated
@@ -238,6 +239,8 @@ func main() {
WatchFilterValue: watchFilterValue,
WaitInfraPeriod: waitInfraPeriod,
Endpoints: awsServiceEndpoints,
NewOCMClient: rosa.NewOCMClient,
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 not a good idea to create the clients here in the main . why do you need to do that ? for integration test you may just mock the clients.

Copy link
Contributor

Choose a reason for hiding this comment

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

No need to expose and init the clients in main. We can init the clients (sts and ocm) internally in the struct and regards the integration test you can mock it similar to this here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I moved the initialization to SetupWithManager that seems to me as the only ROSAMachinePoolReconciler method where it fits. I am using same mechanism to create the mock implementation as the STS api.

pkg/rosa/idps.go Outdated
@@ -4,7 +4,6 @@ import (
"fmt"

cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
"github.com/openshift/rosa/pkg/ocm"
Copy link
Contributor

Choose a reason for hiding this comment

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

We are using the github.com/openshift/rosa/pkg/ocm in order to avoid duplicate the effort of creating a lib that communicate with OCM. Please keep using it for this first integration test iteration

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can't use github.com/openshift/rosa/pkg/ocm directly here, because it doesn't expose interface that we could mock. So I had to create mockable interface at our side to be able to mock the ocm calls.

The guys that are developing github.com/openshift/rosa/pkg/ocm are planning to create (and I hope also expose) OCM calls as interface to increase the testability of OCM code. So we could get rid of this in the future. But I am not sure how long will it take them to do it.

pkg/rosa/idps.go Outdated
@@ -14,7 +13,7 @@ const (

// CreateAdminUserIfNotExist creates a new admin user withe username/password in the cluster if username doesn't already exist.
// the user is granted admin privileges by being added to a special IDP called `cluster-admin` which will be created if it doesn't already exist.
func CreateAdminUserIfNotExist(client *ocm.Client, clusterID, username, password string) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

We are using the github.com/openshift/rosa/pkg/ocm in order to avoid duplicate the effort of creating a lib that communicate with OCM. Please keep using it for this first integration test iteration

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above

Copy link
Contributor

Choose a reason for hiding this comment

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

okay, just github duplication

@AndiDog
Copy link
Contributor

AndiDog commented Nov 19, 2024

/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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 19, 2024
@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch from abd21bc to 5eeb8ef Compare November 19, 2024 09:25
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2025
@nrb
Copy link
Contributor

nrb commented Jan 14, 2025

/area testing

@k8s-ci-robot k8s-ci-robot added the area/testing Issues or PRs related to testing label Jan 14, 2025
pkg/rosa/client.go Outdated Show resolved Hide resolved
@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch from e027cf5 to 76a2803 Compare January 15, 2025 09:04
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2025
@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch from 76a2803 to 29c0505 Compare January 15, 2025 09:20
@nrb
Copy link
Contributor

nrb commented Jan 21, 2025

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

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 Jan 21, 2025
@serngawy
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 21, 2025
@PanSpagetka
Copy link
Contributor Author

/retest

1 similar comment
@PanSpagetka
Copy link
Contributor Author

/retest

@nrb
Copy link
Contributor

nrb commented Jan 22, 2025

/test pull-cluster-api-provider-aws-test

Max number of VPCs reached

@serngawy
Copy link
Contributor

/test pull-cluster-api-provider-aws-test

@PanSpagetka
Copy link
Contributor Author

/retest

@PanSpagetka
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-test

@PanSpagetka
Copy link
Contributor Author

/retest

@nrb
Copy link
Contributor

nrb commented Jan 28, 2025

/retest

VPC capacity issues, not flakes in the suite.

@damdo
Copy link
Member

damdo commented Jan 29, 2025

/test pull-cluster-api-provider-aws-test

@damdo
Copy link
Member

damdo commented Jan 29, 2025

@PanSpagetka the test failure could be legit, PTAL:

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/5214/pull-cluster-api-provider-aws-test/1884498590013853696#

@PanSpagetka PanSpagetka force-pushed the rosa-initial-integration-test branch from 29c0505 to b926856 Compare January 29, 2025 11:17
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 29, 2025
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@PanSpagetka
Copy link
Contributor Author

/retest

@PanSpagetka
Copy link
Contributor Author

@serngawy @nrb I resolved the test failure, could you please lgtm once more?

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. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants