bump capi to v1.3.1

[sonasingh46]

Signed-off-by: Ashutosh Kumar [email protected]

What type of PR is this?

Bump capi to v1.3.1
https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.3.1

What this PR does / why we need it:

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:

Bump CAPI to v1.3.1

[sonasingh46]

/cherry-pick release-1.6

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.6

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.

[sonasingh46]

cc @jackfrancis

[sonasingh46]

/retest

[sonasingh46]

/retest

[sonasingh46]

/test pull-cluster-api-provider-azure-apiversion-upgrade

[CecileRobertMichon]

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

[sonasingh46]

/retest

[sonasingh46]

/retest

[sonasingh46]

/retest

[mboersma]

/retest

[mboersma]

/retest

[CecileRobertMichon]

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

/lgtm

[CecileRobertMichon]

/approve

[k8s-ci-robot]

[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:

• OWNERS [CecileRobertMichon]

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

[mboersma]

/retest

[sonasingh46]

/retest

[k8s-infra-cherrypick-robot]

@sonasingh46: #2940 failed to apply on top of branch "release-1.6":

Applying: bump capi to v1.3.1
Using index info to reconstruct a base tree...
M	Makefile
M	Tiltfile
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
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Tiltfile
CONFLICT (content): Merge conflict in Tiltfile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump capi to v1.3.1
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.6

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.