Rebase upstream latest

[alexander-demicev]

This commit rebases the cluster-api-provider-gcp openshift patches on top of the kubernetes-sigs/ cluster-api-provider-gcp main branch after.
There are several commits that we carry on top of the upstream cluster-api-provider-gcp 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 c26a68b23e9317323d5d37660fe9d29b3d2ff40c..openshift/master

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 c26a68b23e9317323d5d37660fe9d29b3d2ff40c
$ git checkout -b merge-tmp # create a temporary branch for our merge commit
$ git checkout openshift/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'merge latest upstream changes' | 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.

   498c4ae9e UPSTREAM: <carry>: Add vendor directory
   3c05c04f3 UPSTREAM: <carry>: Add openshift specific changes

Changed Commits

---

Dropped Commits

Click to expand

• 57dc1b0 update golang version to 1.17
• c2cb4b9 add BUILD_IMAGE to Makefile and update non-container build
• 1331f12 refactor and add new test case
• 892aa9a add mocked test for passing guestAccelerators to api
• fb0c73d update unit tests
• 2eda7e6 Try fix broken path for rhcos image
• de4fdb3 add annotation to enable gpu autoscaling
• b4efb36 Updating ose-gcp-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/3dea8426481b269476342fc0a631273f32ce691e/images/ose-gcp-machine-controllers.yml
• fe366ad add support for GPUs on GCP
• 0bf6207 Updat golang image to version 1.16 inside Makefile
• 73c7bcf Refactor NewComputeService function to support workload identity
• 3c810c6 update golang.org/x/oauth2 to support gcp workload identity
• a171d8b Ensure HOME is set for cache setup
• c6faa4b Bug 1994480: Update dependencies to K8s 1.22
• 0973e28 Bug 1990447: Create event only if the machine was modified
• 9d216df Updating .ci-operator.yaml build_root_image from openshift/release
• 38cc464 update .gitignore
• 97cbe39 Add script for fixing permission issues when running make targets with podman
• 6356d82 add in-container vendor
• 6f8480f Update make targets to run with podman and docker or without container
• 8affa96 Bug 1948719: update controller-runtime dependency
• f3f5ddf Bug 1954177: Update mao dependency for webhook v1 changes
• 8cae5fd ensure CGO_ENABLED=0 on all makefile commands that need it
• c246d91 update k8s dependencies to 1.21
• 48e8cd7 Updating ose-gcp-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0c10ae924af72f1c759cf8b24b50de94c02e6268/images/ose-gcp-machine-controllers.yml
• ee637a8 Only log error on nonexistent instance type for scale from zero
• 9a8b1c1 Bug 1910318: Ensure original conditions aren't mutated during reconcile
• 1eb7aae Bug 1910318: Add condition to show actuator exists condition on machine
• 1400bc9 Ensure response body is closed when we are finished with the request
• a2e22cc Updating ose-gcp-machine-controllers builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5a1293dd0f380abf50c12d65c36655486d7745d0/images/ose-gcp-machine-controllers.yml
• e4397fb Try to mark node for up to 30 seconds when termination notice observed
• 54a51bf Fix controllers for updated controller-runtime
• fb6b9c4 Bug 1909108: Bump K8s dependencies to 1.20
• 59e8264 Ensure Machine is marked interruptible as well as Node
• 3cc4a0b Bug 1903424: Ensure MAO dependency is up to date to include newest metrics
• 3432bf5 Vendor: downgrade gcp sdk to v0.57.0
• 5ba9419 Update termination handler to use node conditions
• 987943d Bump scripts to Go 1.15
• dfe3731 Updating ose-gcp-machine-controllers builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/f82a216a6a3707b80a635bace9367f1a8288b7a7/images/ose-gcp-machine-controllers.yml
• 88c38a4 Add verify-diff check in generate task
• 4eadb41 Allow users to provide the Service Account to be used for disk encrytion
• ce68d06 Update google.golang.org/api to allow for setting KMSKeyServiceAccount
• 6debbb5 Set Disk Encryption on instance when creating VMs if set
• 1509c50 Add Encryption Key reference to GCP Disk spec
• 5b6c242 add bugzilla component and subcomponent to OWNERS
• b24ca0e Bug 1883497: Fix missing logs due to mixed klog versions
• 7f76147 Fix missing logs due to mixed klog versions
• 98ecfa3 BUG 1875598: Ensure the Virtual Machine provider state is set to Unknown when Failed
• 6230044 Updating Dockerfile.rhel baseimages to mach ocp-build-data config
• 6899617 BUG 1877743: Bump K8s dependencies to v1.19.0
• 14aa0f1 Add test for machine scope
• 13fca89 Add Dockerfile.rhel to match build configuration in ocp-build-data
• 4cafb0e Updating Dockerfile baseimages to mach ocp-build-data config
• 3739cfa Slow the default lease retry and renew rate for machine controller
• 3b73b7e Ensure subnet is accessed from correct project
• 2acd93e Support networks shared from a different project
• 237c812 Add tests for actuator exists()
• d718d47 Add tests for actuator events
• 1c2f3ef Validate machine labels in update()
• c6e62d5 Add GCP client builder
• 0b45469 Improve error formatting
• b6ffeed Pass context to machine scope
• 97fcb01 Revendor mao to bring Bug 1857175: enforce clusterID label via webhook and preserve old behaviour in the backend machine-api-operator#644
• 12aba6d Use Contains() instead of Index()
• bc0f08e Remove duplicate imports
• 8c87213 Increate leader election lease time
• e834e31 Ensure tests aren't racing by only running handler when needed
• 7d896fa Ensure scheme registration is tested within termination test suite
• 8b35c41 Pass scheme to client creation so that it uses scheme with Machine API
• af8be8c Bump golang.org/x/text to v0.3.3
• 51d7c6e support sourceImage outside the existing project
• 48e2377 Add unit tests for label reconciliation
• f023886 Add machine api to scheme
• 09edbdf Add spot intance label to machine spec
• e99eda8 Revendor MAO
• 6dc8c3e Integrate metrics for api interaction
• 5ab2245 Add termination handler tests
• d2c03d1 Add termination handler
• db24c1b Add spot instances label to machines
• e4c97a6 Add termination handler to Makefile and Dockerfile
• bcd0613 Add machine CRD
• 8b1645c Implement leader election for gcp provider
• 1687d9f Add configv1 to scheme
• edc8cd8 Revendor MAO
• ff33d19 Add support for preemptible instances
• 1214167 Add health checks
• 6cec62c Add dgrigore to approvers
• 955e2a9 Update machine-api-operator dependency
• dcffc85 Added unknown state for externally removed machines
• a6f0f70 Bump all dependencies to kube 1.18
• 69c81c2 Add the machine's name as a known NodeInternalDNS
• 976ab17 Update dependencies
• dc1e6c5 Switch to Go errors instead of github.com/pkg/errors
• c606d12 Update OWNERS with current team members
• 58ff4ad Update vendor
• 6ac1c5c Remove MachineSet manager from image
• b0c071f Bump scripts to Go 1.13
• eee908d Restore original make unit behaviour
• ba8baf9 Add envtest binaries for testing
• 0289eb6 make vendor
• ae932c0 Add envTest tests for reconciler
• be171f1 Add tests for reconcile
• d35c7ab Add machineset controller
• b79c2b2 Remove bison from OWNERS file
• fa7f712 Revendor mao with timeout formatting fix
• cffa662 Replace update with patch
• 56fb15d Add git ignore
• 9a9b546 Vendor dependencies
• 098edab Remove unnecessary machine specific client
• 80c4f4d Revendor MAO with new node draining feature
• a1aeb2a OWNERS: remove frobware
• 2f4b190 Update owners
• e04197c Add more unit tests for reconciler
• c90454e UPSTREAM: : openshift: Bring mao and drop cluster struct references to satisfy actuator interface
• b8df84e UPSTREAM: : openshift: Revendor to drop openshift/cluster-api in favour of machine-api-operator
• 5a7ec1f Consider an instance to exist regardless the status
• c15324d Report machineapierros.InvalidMachineConfiguration when appropriate
• e9050a4 Revendor to pick machine controller with phases support
• 7faf302 Revendor for kube-1.16.0
• 1e01404 UPSTREAM: : openshift: Revendor to bring Bug 1752088: UPSTREAM: <carry>: openshift: Drop isDeleteAllowed func cluster-api#72
• 08892fa Fix 'make goimports' complaint
• 6efa0cd Fix linking on other architectures
• 7e0c902 Revendor for go modules
• 9b4dac9 Switch to go modules
• 7939516 machine/machine_scope: update status first in Close()
• 8154d08 Label instances created by the actuator with cluster ID
• 00cf1e4 update vendor
• da684fe Allow invalid project/zone machines to be deleted
• 7086d27 Disable metrics serving
• 0b80a36 Update machine status only when changed
• 42fea18 Update controller-runtime to pull implementation of Patch operation
• f78568f Introduce gosec for security checks
• d36f5e8 Extend makefile with 'make goimports' target
• b767097 WIP: Set additional machine annotations/labels to get pretty machine output
• 7ff2998 Add support for TargetPools
• 868c710 Bump openshift/cluster-api dependencies
• 4be6559 Remove special error type when returning to controller
• 5166222 Add project ID to machine provider spec
• ce1b660 Return errors from scope.Close()
• 1ff8d0c Use the same key for both internal addresses
• 8b47586 Pass full URL to image when creating compute instance
• 0079711 Do not b64-encode user data
• ab5abd6 Allow specifying whether you want a public IP
• 82be039 Fix name of the credentials key
• 1d716f7 Add namespace flag to controller command
• ee6274e Modify GCP client user agent to contain provider version
• f42c56a Vendor semver dependency
• e3c068e Add version flag
• a03be9f Update vendor cluster-api and kubernetes-drain
• d1afbac Prepend machine.Name to logging
• b69353a Switch builds to use Go 1.12
• 864807b Implement events
• 492fd64 Add e2e make test
• 1e82de0 Alter gcp actuator code to accept updated packages
• 00e8db7 Update k8s version to 1.14
• 93fbbf7 Fix fmt/args error in exists()
• 6bbaf1a Remove waitUntilOperationCompleted
• 22bb5ae Make delete async
• e31b63a reconciler: change exists to consider TERMINATED state only
• 425c410 Convert create into async
• 8bfc0cd Update instance internal-dns names
• 3644053 Add conditions support for reconcileMachineWithCloudState
• 63f946a Add conditions helpers library
• 4d2e0b4 Add providerStatus.Conditions to the API
• 8fef0bd Add log for operationType
• 3ec4de0 Fix field reference on getCredentialsSecret
• f2d4588 Implement Delete
• 4ae01d0 Add docs and stop closing scope on exists()
• b391b20 Add support for update operation
• fead0fa More logging for exists method
• 219bb26 Implement Exists
• 96edcb3 Add reconcileMachineWithCloudState() to sync machine status
• 99cdd47 Add providerID and providerStatus to machine scope and use new struct type <-> rawExtension methods
• a5d178c Makefile: drop nested quoting
• db692ed Add struct type <-> rawExtension methods for providerSpec and providerStatus
• 3f32921 Add status API types
• 6012814 Add owners file
• c7e5094 Add Dockerfile
• f1c37e1 Fix go vet errors
• 30c3915 Add basic make file: unit, fmt, vet, build
• 998510d Revendor for bringing openshift/cluster-api core controller manager
• 02419e7 Implement create method
• 7f6e4e9 Add basic API
• a1dcaa2 Run first vendoring
• 6642246 Add readme
• cd3c18f Initial commit

[JoelSpeed]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [JoelSpeed]

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

[Fedosin]

/lgtm