Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WINC-667: [release-4.8] [vendor] Bump OpensShift dependencies to latest #629

Merged

Conversation

mansikulkarni96
Copy link
Member

This PR bumps OpenShift depedencies to latest
release-4.8 commits.
Bumped github.com/openshift/api, github.com/openshift/library-go
and github.com/openshift/machine-api-operator.
Ran go mod tidy && go mod vendor && go mod verify
This commit also fixes make build by changing
azureprovider.ManagedDisk -> azureprovider.ManagedDiskParameters
in test/e2e/providers/azure/azure.go

This commit bumps OpenShift depedencies to latest
release-4.8 commits.
Bumped github.com/openshift/api, github.com/openshift/library-go
and github.com/openshift/machine-api-operator.
Ran `go mod tidy && go mod vendor && go mod verify`
This commit also fixes 'make build' by changing
azureprovider.ManagedDisk -> azureprovider.ManagedDiskParameters
in test/e2e/providers/azure/azure.go
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 23, 2021

@mansikulkarni96: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.8] [vendor] Bump OpensShift dependencies to latest

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.

@mansikulkarni96 mansikulkarni96 changed the title [release-4.8] [vendor] Bump OpensShift dependencies to latest [WINC-667]: [release-4.8] [vendor] Bump OpensShift dependencies to latest Aug 23, 2021
@mansikulkarni96 mansikulkarni96 changed the title [WINC-667]: [release-4.8] [vendor] Bump OpensShift dependencies to latest WINC-667: [release-4.8] [vendor] Bump OpensShift dependencies to latest Aug 23, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 23, 2021

@mansikulkarni96: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[WINC-667]: [release-4.8] [vendor] Bump OpensShift dependencies to latest

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
Copy link
Contributor

openshift-ci bot commented Aug 23, 2021

@mansikulkarni96: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WINC-667: [release-4.8] [vendor] Bump OpensShift dependencies to latest

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.

Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this, @mansikulkarni96

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 23, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp, mansikulkarni96

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 23, 2021
Copy link
Contributor

@saifshaikh48 saifshaikh48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 23, 2021
@jrvaldes
Copy link
Contributor

/lgtm

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@mansikulkarni96
Copy link
Member Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 23, 2021
@mansikulkarni96
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 24, 2021
@openshift-merge-robot openshift-merge-robot merged commit 3b45e70 into openshift:release-4.8 Aug 24, 2021
@alinaryan
Copy link
Contributor

/cherry-pick community-4.8

@openshift-cherrypick-robot

@alinaryan: #629 failed to apply on top of branch "community-4.8":

Applying: Bump OpensShift dependencies to latest
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/cloud.google.com/go/compute/metadata/metadata.go
M	vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/operator/v1/0000_10_config-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_40_cloud-credential-operator_00_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml.git/rebase-apply/patch:33556: trailing whitespace.
You can also pre-compile your query. This is usefull if 
error: patch failed: vendor/github.com/MakeNowJust/heredoc/README.md:1
error: vendor/github.com/MakeNowJust/heredoc/README.md: patch does not apply
.git/rebase-apply/patch:33494: new blank line at EOF.
+
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch

M	vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/types_dns.go
M	vendor/github.com/openshift/api/operator/v1/types_network.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
M	vendor/golang.org/x/oauth2/go.mod
M	vendor/golang.org/x/oauth2/go.sum
M	vendor/modules.txt
Patch failed at 0001 Bump OpensShift dependencies to latest
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick community-4.8

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants