Bug 1848755: Revendor MAO and client-go

[openshift-cherrypick-robot]

This is an automated cherry-pick of #101

/assign iamemilio

[openshift-ci-robot]

@openshift-cherrypick-robot: Bugzilla bug 1843597 has been cloned as Bugzilla bug 1848755. Retitling PR to link against new bug.
/retitle [release-4.5] Bug 1848755: Revendor MAO and client-go

In response to this:

[release-4.5] Bug 1843597: Revendor MAO and client-go

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.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1848755, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.5.0) matches configured target release for branch (4.5.0)
• bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1843597 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Bugzilla bug 1843597 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
• bug has dependents

In response to this:

[release-4.5] Bug 1848755: Revendor MAO and client-go

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.

[iamemilio]

/lgtm
/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamemilio, openshift-cherrypick-robot

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 [iamemilio]

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

[pierreprinetti]

/assign @sdodson

[pierreprinetti]

/uncc tomassedovic
/cc mandre
/cherry-pick release-4.4
/retitle Bug 1848755: Revendor MAO and client-go

[openshift-cherrypick-robot]

@pierreprinetti: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/uncc tomassedovic
/cc mandre
/cherry-pick release-4.4
/retitle Bug 1848755: Revendor MAO and client-go

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.

[pierreprinetti]

@iamemilio @Fedosin is #98 a prerequisite for backporting to 4.4?

[iamemilio]

Yes, we should cherry-pick this into #98

[sdodson]

Yes, we should cherry-pick this into #98

you mean when backporting this change to release-4.4 we should merge the pick from this PR and #98 into one PR so that we don't introduce a temporary regression?

[openshift-ci-robot]

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged: openshift/cluster-api-provider-openstack#102. Bugzilla bug 1848755 has been moved to the MODIFIED state.

In response to this:

Bug 1848755: Revendor MAO and client-go

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.

[openshift-cherrypick-robot]

@pierreprinetti: #102 failed to apply on top of branch "release-4.4":

Using index info to reconstruct a base tree...
A	go.mod
A	go.sum
A	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
A	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
M	vendor/github.com/openshift/api/config/v1/types_authentication.go
M	vendor/github.com/openshift/api/config/v1/types_feature.go
M	vendor/github.com/openshift/api/config/v1/types_infrastructure.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
A	vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/common_types.go
A	vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machine_types.go
A	vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machineset_types.go
A	vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go
A	vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.go
A	vendor/golang.org/x/sys/unix/README.md
A	vendor/golang.org/x/sys/unix/mkall.sh
A	vendor/golang.org/x/sys/unix/mkerrors.sh
A	vendor/modules.txt
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): vendor/modules.txt deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of vendor/modules.txt left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/mkerrors.sh deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of vendor/golang.org/x/sys/unix/mkerrors.sh left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/mkall.sh deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of vendor/golang.org/x/sys/unix/mkall.sh left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/README.md deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of vendor/golang.org/x/sys/unix/README.md left in tree.
Auto-merging vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/github.com/openshift/cluster-api/pkg/controller/machine/controller.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/cluster-api/pkg/controller/machine/controller.go
Auto-merging vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machineset_types.go
Auto-merging vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machine_types.go
Auto-merging vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/common_types.go
Auto-merging vendor/github.com/openshift/cluster-api/go.sum
CONFLICT (content): Merge conflict in vendor/github.com/openshift/cluster-api/go.sum
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_infrastructure.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_infrastructure.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_feature.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_feature.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_authentication.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_authentication.go
CONFLICT (modify/delete): vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml left in tree.
CONFLICT (modify/delete): vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml left in tree.
CONFLICT (modify/delete): go.mod deleted in HEAD and modified in revendor MAO and client-go. Version revendor MAO and client-go of go.mod left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 revendor MAO and client-go

In response to this:

/uncc tomassedovic
/cc mandre
/cherry-pick release-4.4
/retitle Bug 1848755: Revendor MAO and client-go

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.