WIP: AUTOSCALE-335: AUTOSCALE-336: rebase on upstream 1.34.0 release

[maxcao13]

This commit rebases the autoscaler on top of the Kubernetes/Autoscaler 1.34.0 release. There are several commits that we carry on top of the upstream autoscaler and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(inspired by the commit description for the 1.18 rebase. pr #139)

Process

First we need to identify the carry commits that we currently have, this is done against our previous rebase 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 (run from the openshift/master branch), these are the commits that begin with UPSTREAM: up until the merge commit for the previous rebase commit (merge upstream/cluster-autoscaler-release-1.33 into main)

git log -n 30 --oneline --no-merges

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 cluster-autoscaler-1.34.0
$ git checkout -b merge-tmp # create a temporary branch for our merge commit
$ git checkout openshift/main # we want to be at the tip of the openshift main branch when we run the next command
$ echo 'merge upstream/cluster-autoscaler-1.34.0' | 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 merge-1.34 deadbeef12345678 # create a new branch for the cherry-pick work
$ git checkout merge-1.34
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the merge-1.34 branch in place, I cherry picked the carry commits which applied, resolved merge conflicts, and finally tested the resulting tree against the unit test and end-to-end suite.

Carried Commits

These commits are for features which have not yet been accepted upstream, are integral to our CI platform, or are specific to the releases we create for OpenShift.

0abcccedf UPSTREAM: <carry>: Update to prefer upstream annotations if present
8e00fc00f UPSTREAM: <carry>: Fix unstructured taint parsing in Cluster API provider
c3ac09e29 UPSTREAM: <carry>: add machine api label and taint functionality
63602f348 UPSTREAM: <carry>: Have VPA ignore phantom containers named "POD"
4c5e260a7 UPSTREAM: <carry>: Handle old Machine API specific machine delete annotation
e0f1bb728 UPSTREAM: <carry>: Rename FailureMessage to ErrorMessage
f449d81b8 UPSTREAM: <carry>: vendor deps for OpenShift releases
dd1b86512 UPSTREAM: <carry>: configure repository for OpenShift releases

Squashed Commits

These commits were squashed into the carried commits to help reduce the length of our history. All these commits have been squashed into their topically related commits.

9b4150aa0 UPSTREAM: <carry>: Remove OWNERS automation preamble

Dropped Commits
These commits were dropped.

8f15f9147 UPSTREAM: 8396: Fix balancer & CA kwok build / govet errors
4d42a1d4d UPSTREAM: <carry>: revert capacity annotations

Of special note in this rebase is this dropped commit

4d42a1d4d UPSTREAM: <carry>: revert capacity annotations

due to the scale from zero changes being accepted upstream we can now drop our carried patch. but, the upstream implementation has differed slightly from our's (mainly around annotation names). we will need to carry this patch until we can fix all the providers to properly use the new annotations. This patch can be dropped once the epic contained in https://issues.redhat.com/browse/OCPCLOUD-2136 is completed.
Update: This was from one of the previous rebases. The epic is now completed so we are now dropping this carry.

[openshift-ci-robot]

@maxcao13: This pull request references AUTOSCALE-335 which is a valid jira issue.

In response to this:

This commit rebases the autoscaler on top of the Kubernetes/Autoscaler 1.34.0 release. There are several commits that we carry on top of the upstream autoscaler and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.

(inspired by the commit description for the 1.18 rebase. pr #139)

Process

First we need to identify the carry commits that we currently have, this is done against our previous rebase 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 (run from the openshift/master branch), these are the commits that begin with UPSTREAM: up until the merge commit for the previous rebase commit (merge upstream/cluster-autoscaler-release-1.33 into main)

git log -n 30 --oneline --no-merges

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 cluster-autoscaler-1.34.0
$ git checkout -b merge-tmp # create a temporary branch for our merge commit
$ git checkout openshift/main # we want to be at the tip of the openshift main branch when we run the next command
$ echo 'merge upstream/cluster-autoscaler-1.34.0' | 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 merge-1.34 deadbeef12345678 # create a new branch for the cherry-pick work
$ git checkout merge-1.34
$ git cherry-pick <carry commits> # cherry pick the needed commits into the new branch

With the merge-1.34 branch in place, I cherry picked the carry commits which applied, resolved merge conflicts, and finally tested the resulting tree against the unit test and end-to-end suite.

Carried Commits

These commits are for features which have not yet been accepted upstream, are integral to our CI platform, or are specific to the releases we create for OpenShift.

0abcccedf UPSTREAM: <carry>: Update to prefer upstream annotations if present
8e00fc00f UPSTREAM: <carry>: Fix unstructured taint parsing in Cluster API provider
c3ac09e29 UPSTREAM: <carry>: add machine api label and taint functionality
63602f348 UPSTREAM: <carry>: Have VPA ignore phantom containers named "POD"
4c5e260a7 UPSTREAM: <carry>: Handle old Machine API specific machine delete annotation
e0f1bb728 UPSTREAM: <carry>: Rename FailureMessage to ErrorMessage
f449d81b8 UPSTREAM: <carry>: vendor deps for OpenShift releases
dd1b86512 UPSTREAM: <carry>: configure repository for OpenShift releases

Squashed Commits

These commits were squashed into the carried commits to help reduce the length of our history. All these commits have been squashed into their topically related commits.

9b4150aa0 UPSTREAM: <carry>: Remove OWNERS automation preamble

Dropped Commits
These commits were dropped.

8f15f9147 UPSTREAM: 8396: Fix balancer & CA kwok build / govet errors
4d42a1d4d UPSTREAM: <carry>: revert capacity annotations

Of special note in this rebase is this dropped commit

4d42a1d4d UPSTREAM: <carry>: revert capacity annotations

due to the scale from zero changes being accepted upstream we can now drop our carried patch. but, the upstream implementation has differed slightly from our's (mainly around annotation names). we will need to carry this patch until we can fix all the providers to properly use the new annotations. This patch can be dropped once the epic contained in https://issues.redhat.com/browse/OCPCLOUD-2136 is completed.
Update: This was from one of the previous rebases. The epic is now completed so we are now dropping this carry.

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.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jkyros for approval. For more information see the Code Review Process.

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

Needs approval from an approver in each of these files:

• OWNERS

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

[openshift-ci]

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the openshift org. You can then trigger verification by writing /verify-owners in a comment.

• sig-autoscaling-vpa-reviewers
  • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
• sig-autoscaling-leads
  • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

[openshift-ci]

@maxcao13: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-periodic-pre	09260d1	link	false	/test e2e-aws-periodic-pre
ci/prow/okd-scos-e2e-aws-ovn	09260d1	link	false	/test okd-scos-e2e-aws-ovn
ci/prow/govet	09260d1	link	true	/test govet
ci/prow/e2e-azure-operator	09260d1	link	false	/test e2e-azure-operator
ci/prow/images	09260d1	link	true	/test images
ci/prow/okd-scos-images	09260d1	link	true	/test okd-scos-images
ci/prow/e2e-hypershift	09260d1	link	true	/test e2e-hypershift
ci/prow/e2e-gcp-operator	09260d1	link	false	/test e2e-gcp-operator
ci/prow/git-history	09260d1	link	false	/test git-history
ci/prow/e2e-aws	09260d1	link	true	/test e2e-aws
ci/prow/security	09260d1	link	true	/test security
ci/prow/unit	09260d1	link	true	/test unit
ci/prow/e2e-aws-operator	09260d1	link	true	/test e2e-aws-operator

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.

[maxcao13]

/hold

[maxcao13]

Closing in favour of #386