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

Integration test for disable default cni flag #113

Merged
merged 7 commits into from
Sep 9, 2024

Conversation

maci3jka
Copy link

Added tests with disableDefaultCNI set to true for change #110 and improved loging.
Readme fixes.

KU-1226

@maci3jka maci3jka requested review from eaudetcobello and a team August 28, 2024 14:05
@maci3jka maci3jka changed the title Ku 1226/integration test for disable default cni flag Integration test for disable default cni flag Aug 28, 2024
README.md Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
Copy link

@eaudetcobello eaudetcobello left a comment

Choose a reason for hiding this comment

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

Good start but there is work left to be done

integration/README.md Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
templates/cluster-template-aws.yaml Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
Copy link

@bschimke95 bschimke95 left a comment

Choose a reason for hiding this comment

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

Going in the right direction, added a couple of comments.

In general, have you validated that it is fine to remove those environment variables and hardcode the values in the templates? e.g. are we only using this once and nowhere else?

@@ -4,40 +4,10 @@

The integration/e2e tests have the following prerequisites:

* an environment variable `CLUSTER_MANIFEST_FILE` pointing to the cluster manifest. Cluster manifests can be produced with the help of the templates found under `templates`. For example:

Choose a reason for hiding this comment

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

Are those prerequisites not required anymore?

Copy link
Author

Choose a reason for hiding this comment

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

yes those are not required they are hardcoded in cluster manifest dir

integration/cluster-manifests/cluster-inplace.yaml Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
@maci3jka
Copy link
Author

maci3jka commented Sep 3, 2024

In general, have you validated that it is fine to remove those environment variables and hardcode the values in the templates? e.g. are we only using this once and nowhere else?

yest they are used only in tests

@maci3jka maci3jka requested a review from bschimke95 September 3, 2024 15:51
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
integration/e2e_test.go Outdated Show resolved Hide resolved
removed unnecessary functions
Copy link

@bschimke95 bschimke95 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@kwmonroe kwmonroe left a comment

Choose a reason for hiding this comment

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

Couple doc tweaks for your consideration, but otherwise LGTM. Thanks @maci3jka!

Comment on lines +7 to +8
* make sure to have ssh key in aws `capi`in `us-east-1 region` if you do not have key refer
to CAPI on [AWS prerequisites documentation](https://cluster-api-aws.sigs.k8s.io/topics/using-clusterawsadm-to-fulfill-prerequisites#ssh-key-pair)
Copy link

Choose a reason for hiding this comment

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

Suggested change
* make sure to have ssh key in aws `capi`in `us-east-1 region` if you do not have key refer
to CAPI on [AWS prerequisites documentation](https://cluster-api-aws.sigs.k8s.io/topics/using-clusterawsadm-to-fulfill-prerequisites#ssh-key-pair)
* ensure an AWS ssh key pair named `capi` exists according to the [CAPI Provider AWS documentation](https://cluster-api-aws.sigs.k8s.io/topics/using-clusterawsadm-to-fulfill-prerequisites#ssh-key-pair)

integration/README.md Outdated Show resolved Hide resolved
integration/README.md Outdated Show resolved Hide resolved
Co-authored-by: Kevin W Monroe <[email protected]>
@maci3jka maci3jka force-pushed the KU-1226/integration-test-for-disableDefaultCNI-flag branch from 7470d77 to f313dcc Compare September 9, 2024 08:42
@maci3jka maci3jka merged commit eab4b8b into main Sep 9, 2024
4 checks passed
@maci3jka maci3jka deleted the KU-1226/integration-test-for-disableDefaultCNI-flag branch September 9, 2024 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants