Rebase to v1.1.2

[alexander-demicev]

This commit rebases the cluster-api openshift patches on top of the kubernetes-sigs/cluster-api master branch after.
There are several commits that we carry on top of the upstream cluster-api and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(replicated @elmiko's process within openshift/kubernetes-autoscaler)

Process

First we need to identify the carry commits that we currently have, this is done against our previous rebase (or fork in this case) to catch new changes. Once identified we will drop commits which have merged upstream and only carry unique commits. (see below for the carried and dropped commits).

Identify carry commits:

git log --oneline --no-merges 3433f7b769b4e7f5cb899b2742a5a8a1a9f51b3e..ocp/master

where b4be01 is the last upstream commit in our fork. This is the
list of commits we will need to apply onto the new upstream version of the
cluster-api. ideally, some of these commits can be dropped.

After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch. The following commands cover these steps:

$ git remote update # make sure we update our refs
$ git checkout 3433f7b769b4e7f5cb899b2742a5a8a1a9f51b3e # release notes for 1.0.3 in this case
$ git checkout -b merge-tmp # create a temporary branch for our merge commit
$ git checkout ocp/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'rebase to v1.1.2' | git commit-tree merge-tmp^{tree} -p HEAD -p merge-tmp -F - # create a new merge commit for our history
deadbeef12345678 # id of new merge commit
$ git branch rebase-upstream-latest deadbeef12345678 # create a new branch for the cherry-pick work
$ git checkout rebase-upstream-latest
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the rebase-upstream-latest branch in place, I cherry picked the carry commits which we should carry.

Carried Commits

These commits are integral to our CI platform, or are specific to the releases we create for OpenShift.

beaafaf2f  UPSTREAM: <carry>: Add openshift specific changes
788312762 UPSTREAM: <carry>: Add vendor directory

Changed Commits

---

Dropped Commits

---

[elmiko]

the commit structure looks generally good to me
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexander-demichev, elmiko

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 [alexander-demichev,elmiko]

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

[openshift-ci]

@alexander-demichev: 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/test-infra repository. I understand the commands that are listed here.

[JoelSpeed]

/lgtm

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-api-container-v4.12.0-202305022015.p0.gf9c215c.assembly.stream for distgit ose-cluster-api.
All builds following this will include this PR.