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

Install cloud-provider-azure chart in e2e tests using CAAPH #3422

Closed
wants to merge 4 commits into from

Conversation

Jont828
Copy link
Contributor

@Jont828 Jont828 commented Apr 13, 2023

What type of PR is this?
/kind feature

What this PR does / why we need it: Use CAAPH to install cloud-provider-azure chart instead of Helm SDK in e2e tests.

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

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:

Install cloud-provider-azure Helm chart using CAAPH

@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. labels Apr 13, 2023
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 13, 2023
@Jont828 Jont828 changed the title Install cloud-provider-azure chart in e2e tests using CAAPH [WIP] Install cloud-provider-azure chart in e2e tests using CAAPH Apr 13, 2023
@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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 13, 2023
@Jont828 Jont828 force-pushed the caaph-e2e branch 2 times, most recently from e60bf36 to 5ccde2c Compare April 18, 2023 00:21
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 18, 2023
@Jont828
Copy link
Contributor Author

Jont828 commented Apr 18, 2023

/retest

1 similar comment
@Jont828
Copy link
Contributor Author

Jont828 commented Apr 19, 2023

/retest

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2023
@Jont828 Jont828 force-pushed the caaph-e2e branch 4 times, most recently from 866fcfd to 7c385be Compare May 15, 2023 22:59
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed 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 May 15, 2023
@Jont828 Jont828 changed the title [WIP] Install cloud-provider-azure chart in e2e tests using CAAPH Install cloud-provider-azure chart in e2e tests using CAAPH May 15, 2023
@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 May 15, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 15, 2023
@Jont828 Jont828 force-pushed the caaph-e2e branch 2 times, most recently from b6452f3 to 580565e Compare May 17, 2023 01:43
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Aug 14, 2023
@mboersma
Copy link
Contributor

/hold

I vendored CAAPH from the current main branch SHA and rebased, but we should update this to use the next CAAPH release tag.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 16, 2023
@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (220fe0f) 56.00% compared to head (a0aee60) 56.02%.
Report is 237 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3422      +/-   ##
==========================================
+ Coverage   56.00%   56.02%   +0.01%     
==========================================
  Files         190      190              
  Lines       19472    19473       +1     
==========================================
+ Hits        10906    10909       +3     
+ Misses       7948     7944       -4     
- Partials      618      620       +2     
Files Coverage Δ
internal/test/env/env.go 53.73% <100.00%> (+0.70%) ⬆️

... and 7 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 16, 2023
@Jont828 Jont828 force-pushed the caaph-e2e branch 2 times, most recently from 8957842 to d7492d1 Compare August 16, 2023 22:24
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 16, 2023
@@ -241,6 +241,7 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
InitWithBootstrapProviders: []string{"kubeadm:v1.0.5"},
InitWithControlPlaneProviders: []string{"kubeadm:v1.0.5"},
InitWithInfrastructureProviders: []string{"azure:v1.0.2"},
// Note: this probably won't work with CAAPH since the Helm install only works with CAPI/clusterctl v1.5.0.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@willie-yao I saw you made some changes here, I don't think we can use the CAAPH install with CAPI v1.0.5. Is there any way we can get around this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a way to add an exception to not use CAAPH for this test? This test is testing the upgrade from the earliest stable version of CAPI to current, so it will be useful to keep around. If not, is there a minimum version of CAPI that will work with CAAPH install?

@mboersma
Copy link
Contributor

Focusing just on the pull-cluster-api-provider-azure-capi-e2e, it's interesting that only certain specs failed waiting for Calico to initialize. I ran a simple scenario locally with this branch and it passed:

AZWI=false GINKGO_FOCUS="Creating a highly available cluster \[REQUIRED\]" \ 
  SKIP_CLEANUP=true ./scripts/ci-e2e.sh

I poked at the workload cluster during this test, and cloud-provider-azure components were all installed and running. So CAAPH seems basically to be working, but somehow this PR makes Calico fail some of the time...

@Jont828
Copy link
Contributor Author

Jont828 commented Aug 18, 2023

Yeah, I ran the e2e tests locally as well and it seemed to work fine for me. I wonder if the version upgrade is causing any issues.

@@ -76,6 +80,17 @@ var _ = Describe("Workload cluster creation", func() {
namespace, cancelWatches, err = setupSpecNamespace(ctx, clusterNamePrefix, bootstrapClusterProxy, artifactFolder)
Expect(err).NotTo(HaveOccurred())

By("Initialize bootstrap client to install add-ons")
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it be feasible to detect the CAPI version here and somehow fall back to the old helm install behavior if it's not >= 1.5.0?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 30, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 5, 2023
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 5, 2023
@k8s-ci-robot
Copy link
Contributor

@Jont828: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-azure-verify a0aee60 link true /test pull-cluster-api-provider-azure-verify
pull-cluster-api-provider-azure-e2e-aks a0aee60 link true /test pull-cluster-api-provider-azure-e2e-aks
pull-cluster-api-provider-azure-conformance a0aee60 link false /test pull-cluster-api-provider-azure-conformance
pull-cluster-api-provider-azure-conformance-with-ci-artifacts a0aee60 link false /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
pull-cluster-api-provider-azure-e2e a0aee60 link true /test pull-cluster-api-provider-azure-e2e
pull-cluster-api-provider-azure-capi-e2e a0aee60 link false /test pull-cluster-api-provider-azure-capi-e2e
pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts a0aee60 link false /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts
pull-cluster-api-provider-azure-apiversion-upgrade a0aee60 link false /test pull-cluster-api-provider-azure-apiversion-upgrade
pull-cluster-api-provider-azure-ci-entrypoint a0aee60 link true /test pull-cluster-api-provider-azure-ci-entrypoint

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 28, 2023
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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.

@CecileRobertMichon
Copy link
Contributor

/close

let's open a new PR for this change once it's ready

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: Closed this PR.

In response to this:

/close

let's open a new PR for this change once it's ready

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
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/feature Categorizes issue or PR as related to a new feature. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. 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.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Use CAAPH to install Helm charts in e2e tests
5 participants