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

Refactor infrastructure-azure templates required by CAPI tests to match CAPD #1423

Merged

Conversation

CecileRobertMichon
Copy link
Contributor

What type of PR is this?

What this PR does / why we need it: Instead of having static templates for capi e2e tests with lots of duplicated yaml, use kustomize to generate the required templates for the CAPI e2e suite. The templates were added to gitignore so they are not checked into code.

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 #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/provider/azure Issues or PRs related to azure provider sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Jun 8, 2021
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 8, 2021
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon CecileRobertMichon changed the title Refactor infrastructure-azure templates required by CAPI tests to match CAPD [WIP] Refactor infrastructure-azure templates required by CAPI tests to match CAPD Jun 8, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 8, 2021
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

1 similar comment
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon CecileRobertMichon changed the title [WIP] Refactor infrastructure-azure templates required by CAPI tests to match CAPD Refactor infrastructure-azure templates required by CAPI tests to match CAPD Jun 10, 2021
@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 Jun 10, 2021
@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

1 similar comment
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/retest

1 similar comment
@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@nader-ziada
Copy link
Contributor

2 questions;

  • what is the empty file used for? templates/test/dev/cluster-template-v1alpha4.yaml
  • Do you think there is value in also checking in the generated yaml templates files like we do with the /templates folder?

@CecileRobertMichon
Copy link
Contributor Author

what is the empty file used for? templates/test/dev/cluster-template-v1alpha4.yaml

removed, it was pushed by mistake

Do you think there is value in also checking in the generated yaml templates files like we do with the /templates folder?

for now I added them to .gitignore (same as CAPI docker e2e templates). No strong opinion here but I was thinking it doesn't really make sense to check them in since they are only used by e2e and get generated when e2e runs.

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

1 similar comment
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

kubernetes-sigs/cluster-api#4830 should help with the drain timeout test (VM deletion is timing out), will disable it until we can pull it in

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon
Copy link
Contributor Author

@nader-ziada this is ready besides the fact that I'm running into the same flake as described in #1440

/retest

@nader-ziada
Copy link
Contributor

/lgtm

will check back in a bit on the e2e run

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

CecileRobertMichon commented Jun 21, 2021

the last run passed, will monitor the health of the periodic job

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Jun 21, 2021
@nader-ziada
Copy link
Contributor

/test pull-cluster-api-provider-azure-e2e

@k8s-ci-robot k8s-ci-robot merged commit f3ecc73 into kubernetes-sigs:master Jun 22, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.5.0 milestone Jun 22, 2021
@CecileRobertMichon CecileRobertMichon deleted the capi-test-templates branch February 17, 2023 23:02
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/provider/azure Issues or PRs related to azure provider 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. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. 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.

3 participants