Don't install CNI twice in e2e tests

[CecileRobertMichon]

What type of PR is this?

/kind flake

What this PR does / why we need it: Since #3971 it seems that we were attempting to install Calico CNI twice, sometimes resulting in flakes. There was a different ControlPlaneWaiter added for skipping the Helm chart install but it never got used, might have been a rebase error.

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:

• cherry-pick candidate

TODOs:

• squashed commits
• includes documentation
• adds unit tests

Release note:

NONE

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (858c9c5) 60.46% compared to head (6f8e6f0) 60.46%.
Report is 2 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4323   +/-   ##
=======================================
  Coverage   60.46%   60.46%           
=======================================
  Files         191      191           
  Lines       19201    19201           
=======================================
  Hits        11610    11610           
  Misses       6947     6947           
  Partials      644      644           

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

[jackfrancis]

/lgtm
/approve

Why do we even have a conditional flow to install calico the previous way (manual helm install) at this point? I would think that w/ the CAAPH change we no longer have a CI scenario that needs a manual helm install of calico.

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: b13fe1ac01dce0cd12131772f80331ae96b9b92e

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

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:

• OWNERS [jackfrancis]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[nojnhuh]

/lgtm

[nojnhuh]

Why do we even have a conditional flow to install calico the previous way (manual helm install) at this point? I would think that w/ the CAAPH change we no longer have a CI scenario that needs a manual helm install of calico.

It looks like we still do the manual helm install for the upgrade test which installs older components that I assume aren't compatible with CAAPH?

cluster-api-provider-azure/test/e2e/capi_test.go

Line 260 in 6f8e6f0

WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,

[nojnhuh]

@CecileRobertMichon Should we cherry pick this to release-1.12?

[CecileRobertMichon]

It looks like we still do the manual helm install for the upgrade test which installs older components that I assume aren't compatible with CAAPH?

Precisely

Should we cherry pick this to release-1.12

yes

/cherry-pick release-1.12

[k8s-infra-cherrypick-robot]

@CecileRobertMichon: new pull request created: #4325

In response to this:

It looks like we still do the manual helm install for the upgrade test which installs older components that I assume aren't compatible with CAAPH?

Precisely

Should we cherry pick this to release-1.12

yes

/cherry-pick release-1.12

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.