NO-JIRA: manual git merge on upstream 0.11

[EmilienM]

What this PR does / why we need it:

Manual merge to handle a git conflict in go.mod.
This was because we fixed the CAPI/tests version before upstream did and that caused
a merge problem. We fix it here.

What I did:

git clone https://github.com/openshift/cluster-api-provider-openstack.git
git remote add openshift https://github.com/openshift/cluster-api-provider-openstack.git
git remote add kubernetes https://github.com/kubernetes-sigs/cluster-api-provider-openstack.git
git fetch kubernetes release-0.11
git checkout -b merge-main
git merge kubernetes/release-0.11 --no-commit
<resolve the conflict in go.mod>
go mod tidy && go mod vendor
git add go.mod go.sum
git rebase --continue
make merge-bot
git commit -a -m "CARRY: run `merge-bot`"

Commits from upstream:

• rm caBundle
• [manual-backport-0.11] Bump CAPI to v1.8.5
• 🌱(deps): Bump sigs.k8s.io/cluster-api/test
• 🌱(deps): Bump golang.org/x/text from 0.19.0 to 0.20.0
• 🌱(deps): Bump sigs.k8s.io/controller-tools in /hack/tools
• Update generated code
• Update generated code
• Update generated code
• 🌱(deps): Bump sigs.k8s.io/kustomize/kustomize/v5 in /hack/tools
• Update generated code
• 🌱(deps): Bump golang.org/x/crypto from 0.28.0 to 0.29.0
• Update generated code

[openshift-ci-robot]

@EmilienM: This pull request explicitly references no jira issue.

In response to this:

What this PR does / why we need it:

Manual merge to handle a git conflict in go.mod.
This was because we fixed the CAPI/tests version before upstream did and that caused
a merge problem. We fix it here.

• rm caBundle
• [manual-backport-0.11] Bump CAPI to v1.8.5
• 🌱(deps): Bump sigs.k8s.io/cluster-api/test
• 🌱(deps): Bump golang.org/x/text from 0.19.0 to 0.20.0
• 🌱(deps): Bump sigs.k8s.io/controller-tools in /hack/tools
• Update generated code
• Update generated code
• Update generated code
• 🌱(deps): Bump sigs.k8s.io/kustomize/kustomize/v5 in /hack/tools
• Update generated code
• 🌱(deps): Bump golang.org/x/crypto from 0.28.0 to 0.29.0
• Update generated code

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 openshift-eng/jira-lifecycle-plugin repository.

[EmilienM]

/assign mandre

[EmilienM]

/approve

[EmilienM]

/hold for CI

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM

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:

• DOWNSTREAM_OWNERS [EmilienM]

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

[EmilienM]

/hold cancel

[openshift-ci]

@EmilienM: all tests passed!

Full PR test history. Your PR dashboard.

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

[mandre]

/lgtm

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: openstack-cluster-api-controllers
This PR has been included in build openstack-cluster-api-controllers-container-v4.19.0-202411130808.p0.g59101d2.assembly.stream.el9.
All builds following this will include this PR.