WINC-674: [vendor] move to openshift/api #788
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
alinaryan
changed the title
saifshaikh48
reviewed
Nov 3, 2021
alinaryan
force-pushed
the
move-to-openshift-api
branch
from
b6ae2ed
to
65bd035
Compare
aravindhp
suggested changes
Nov 3, 2021
There was a problem hiding this comment.
Thanks for working on this, @alinaryan. Just some minor change requests.
test/e2e/create_test.go
Outdated
| @@ -193,7 +193,8 @@ func (tc *testContext) createWindowsMachineSet(replicas int32, windowsLabel bool | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| return tc.client.Machine.MachineSets(clusterinfo.MachineAPINamespace).Create(context.TODO(), machineSet, metav1.CreateOptions{}) | |||
| return tc.client.Machine.MachineSets(clusterinfo.MachineAPINamespace).Create(context.TODO(), machineSet, | |||
| metav1.CreateOptions{}) | |||
There was a problem hiding this comment.
Please revert this change
| @@ -2,33 +2,28 @@ module github.com/openshift/windows-machine-config-operator | |||
|
|
|||
| go 1.16 | |||
|
|
|||
| replace ( | |||
There was a problem hiding this comment.
I suggest naming this commit [vendor] Update openshift/api and openshift/client-go.
alinaryan
force-pushed
the
move-to-openshift-api
branch
3 times, most recently
from
a6e4a49
to
5e06d0d
Compare
aravindhp
reviewed
Nov 3, 2021
| core "k8s.io/api/core/v1" | ||
| meta "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
|
|
||
| "github.com/openshift/windows-machine-config-operator/test/e2e/clusterinfo" | ||
| ) | ||
|
|
||
| const defaultCredentialsSecretName = "vsphere-cloud-credentials" | ||
| const defaultCredentialsSecretName = "mapi-cloud-credentials" |
There was a problem hiding this comment.
The vSphere e2e test is failing because of this.
This commit was needed as the Machine API resources have migrated to openshift/api.
Ran: go get github.com/openshift/api@master go get github.com/openshift/client-go@master Ran: go mod tidy && go mod vendor && go mod verify Ran: make build No build errors.
alinaryan
force-pushed
the
move-to-openshift-api
branch
from
5e06d0d
to
1848b1e
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alinaryan, aravindhp 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:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
saifshaikh48
reviewed
Nov 4, 2021
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Machine API resources have moved from openshift/machine-api to openshift/api.
openshift/machine-api-operator imports were replaced with openshift/api
generated client imports were replaced with client-go