Bump CAPI to v1.9.6

[mboersma]

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI to v1.9.6.

Which issue(s) this PR fixes:

N/A, but see #5438 for prior art.

Special notes for your reviewer:

• cherry-pick candidate

TODOs:

• squashed commits
• includes documentation
• adds unit tests

Release note:

Bump CAPI to v1.9.6

[mboersma]

/cherry-pick release-1.19

[k8s-infra-cherrypick-robot]

@mboersma: once the present PR merges, I will cherry-pick it on top of release-1.19 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.19

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.

[mboersma]

/cherry-pick release-1.18

[k8s-infra-cherrypick-robot]

@mboersma: once the present PR merges, I will cherry-pick it on top of release-1.18 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.18

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.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.86%. Comparing base (d4b50ca) to head (0f580a3).
Report is 3 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #5530   +/-   ##
=======================================
  Coverage   52.86%   52.86%           
=======================================
  Files         272      272           
  Lines       29474    29474           
=======================================
  Hits        15582    15582           
  Misses      13080    13080           
  Partials      812      812           

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[jackfrancis]

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

I was surprised this didn't run, so added this for the future: kubernetes/test-infra#34632

[mboersma]

  Failed to list deployments for the cluster API controllers
  Expected success, but got an error:
      <*errors.StatusError | 0xc000d1d040>: 
      deployments.apps is forbidden: User "system:serviceaccount:test-pods:azure" cannot list resource "deployments" in API group "apps" at the cluster scope
      {

I think kubernetes-sigs/cluster-api#11865 caused these failures.

[mboersma]

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

[mboersma]

/retest

[nawazkh]

Thank you for putting this together !
/lgtm
/approve

[k8s-ci-robot]

LGTM label has been added.

Details

Git tree hash: cbc85623100d9ee749df3fd60ef8d1ec733dca87

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nawazkh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [nawazkh]

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

[k8s-infra-cherrypick-robot]

@mboersma: #5530 failed to apply on top of branch "release-1.19":

Applying: Bump CAPI to v1.9.6
Using index info to reconstruct a base tree...
M	Makefile
M	go.mod
M	go.sum
M	test/e2e/config/azure-dev.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
Auto-merging go.sum
Auto-merging go.mod
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump CAPI to v1.9.6

Details

In response to this:

/cherry-pick release-1.19

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-infra-cherrypick-robot]

@mboersma: #5530 failed to apply on top of branch "release-1.18":

Applying: Bump CAPI to v1.9.6
Using index info to reconstruct a base tree...
M	Makefile
M	docs/book/src/getting-started.md
M	go.mod
M	go.sum
M	test/e2e/config/azure-dev.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
Auto-merging go.sum
Auto-merging go.mod
Auto-merging docs/book/src/getting-started.md
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump CAPI to v1.9.6

Details

In response to this:

/cherry-pick release-1.18

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.