User Story

As a developer I would like to reduce the complexity of updating the cluster autoscaler by removing unnecessary carried code. By removing the annotations changes specific to OpenShift, in favor of the upstream annotations, we will be able to make the updating process for the autoscaler simpler.

Background

As part of migrating to the upstream annotations we need to remove our reversion of the upstream changes. This commit contains contains our downstream modifications.

We need to ensure that the autoscaler continues to respect the information that we carry about labels and taints from the MachineSet object, but in other respects we should focus on removing our customizations for the OpenShift-specific annotations.

<Describes the context or background related to this story>

Steps

• Refactor machine.openshift.io specific changes to use upstream code
• Ensure MAPI MachineSet behavior is preserved for labels and taints
• Update tests, if necessary

Stakeholders

• openshift cloud team

Definition of Done

• carry patch is reduced in size significantly and does not modify upstream annotations

• Docs

• product docs will need updating to reflect the annotations

• Testing

• updating e2e tests where appropriate