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

Jump to bottom

Bug 1986129: Bump openshift/api to add missing 'include.release.openshift.io/single-node-developer' annotation to the ConsolePlugin CRD #573

Merged
merged 1 commit into from Aug 17, 2021
Merged

Bug 1986129: Bump openshift/api to add missing 'include.release.openshift.io/single-node-developer' annotation to the ConsolePlugin CRD #573

merged 1 commit into from Aug 17, 2021

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Aug 12, 2021

/assign @spadgett

@jhadvig
Bug 1986129: Bump openshift/api to add missing 'include.release.opens…
cbd4be8 
…hift.io/single-node-developer' annotation to the ConsolePlugin CRD
@openshift-ci openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 12, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 12, 2021

@jhadvig: This pull request references Bugzilla bug 1986129, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @yanpzhan

In response to this:

Bug 1986129: Bump openshift/api to add missing 'include.release.openshift.io/single-node-developer' annotation to the ConsolePlugin CRD

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 openshift-ci bot requested a review from yanpzhan August 12, 2021 11:48
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 12, 2021
@jhadvig
Copy link
Member Author

jhadvig commented Aug 12, 2021

@spadgett this one will need to by backported manually, since the commit hash will be different for 4.9 and 4.8

@jhadvig
Copy link
Member Author

jhadvig commented Aug 12, 2021

/retest

1 similar comment
@jhadvig
Copy link
Member Author

jhadvig commented Aug 13, 2021

/retest

spadgett
spadgett approved these changes Aug 16, 2021
View reviewed changes
Copy link
Member

@spadgett spadgett 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 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, spadgett

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

/retest-required

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2021 •
edited

@jhadvig: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-single-node cbd4be8 link /test e2e-aws-single-node

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest-required

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

9 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci openshift-ci bot merged commit 293fc16 into openshift:master Aug 17, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 17, 2021

@jhadvig: All pull requests linked via external trackers have merged:

Bugzilla bug 1986129 has been moved to the MODIFIED state.

In response to this:

Bug 1986129: Bump openshift/api to add missing 'include.release.openshift.io/single-node-developer' annotation to the ConsolePlugin CRD

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.

@jhadvig
Copy link
Member Author

jhadvig commented Sep 14, 2021

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link

@jhadvig: #573 failed to apply on top of branch "release-4.8":

Applying: Bug 1986129: Bump openshift/api to add missing 'include.release.openshift.io/single-node-developer' annotation to the ConsolePlugin CRD
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/openshift/api/Makefile
M	vendor/github.com/openshift/api/apiserver/v1/apiserver.openshift.io_apirequestcount.yaml
M	vendor/github.com/openshift/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
M	vendor/github.com/openshift/api/build/v1/generated.proto
M	vendor/github.com/openshift/api/build/v1/types.go
M	vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/cloudnetwork/v1/001-cloudprivateipconfig.crd.yaml
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_03_config-operator_01_proxy.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.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_featuregate.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_oauth.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.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/types_apiserver.go
M	vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
M	vendor/github.com/openshift/api/config/v1/types_cluster_version.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/types_ingress.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/console/v1/0000_10_consoleclidownload.crd.yaml
M	vendor/github.com/openshift/api/console/v1/0000_10_consoleexternalloglink.crd.yaml
M	vendor/github.com/openshift/api/console/v1/0000_10_consolelink.crd.yaml
M	vendor/github.com/openshift/api/console/v1/0000_10_consolenotification.crd.yaml
M	vendor/github.com/openshift/api/console/v1/0000_10_consolequickstart.crd.yaml
M	vendor/github.com/openshift/api/console/v1/0000_10_consoleyamlsample.crd.yaml
M	vendor/github.com/openshift/api/console/v1alpha1/0000_10_consoleplugin.crd.yaml
M	vendor/github.com/openshift/api/go.mod
M	vendor/github.com/openshift/api/go.sum
M	vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
M	vendor/github.com/openshift/api/imageregistry/v1/00-crd.yaml
M	vendor/github.com/openshift/api/imageregistry/v1/01-crd.yaml
M	vendor/github.com/openshift/api/imageregistry/v1/types.go
M	vendor/github.com/openshift/api/imageregistry/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/network/v1/001-clusternetwork-crd.yaml
M	vendor/github.com/openshift/api/network/v1/002-hostsubnet-crd.yaml
M	vendor/github.com/openshift/api/network/v1/003-netnamespace-crd.yaml
M	vendor/github.com/openshift/api/network/v1/004-egressnetworkpolicy-crd.yaml
M	vendor/github.com/openshift/api/networkoperator/v1/001-egressrouter.crd.yaml
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_30_openshift-apiserver-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_40_kube-storage-version-migrator-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_cluster-openshift-controller-manager-operator_02_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_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_50_service-ca-operator_02_crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
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_80_csi_snapshot_controller_operator_01_crd.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_config.go
M	vendor/github.com/openshift/api/operator/v1/types_console.go
M	vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
M	vendor/github.com/openshift/api/operator/v1/types_dns.go
M	vendor/github.com/openshift/api/operator/v1/types_ingress.go
M	vendor/github.com/openshift/api/operator/v1/types_kubecontrollermanager.go
M	vendor/github.com/openshift/api/operator/v1/types_network.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.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/github.com/openshift/api/operatorcontrolplane/v1alpha1/0000_10-pod-network-connectivity-check.crd.yaml
M	vendor/github.com/openshift/api/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
M	vendor/github.com/openshift/api/samples/v1/0000_10_samplesconfig.crd.yaml
M	vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml
Auto-merging vendor/github.com/openshift/api/samples/v1/0000_10_samplesconfig.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/samples/v1/0000_10_samplesconfig.crd.yaml
Auto-merging vendor/github.com/openshift/api/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
Auto-merging vendor/github.com/openshift/api/operatorcontrolplane/v1alpha1/0000_10-pod-network-connectivity-check.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operatorcontrolplane/v1alpha1/0000_10-pod-network-connectivity-check.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_kubecontrollermanager.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_ingress.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_dns.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_console.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_config.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_config.go
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_80_csi_snapshot_controller_operator_01_crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_80_csi_snapshot_controller_operator_01_crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_service-ca-operator_02_crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_50_service-ca-operator_02_crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_cluster-openshift-controller-manager-operator_02_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_50_cluster-openshift-controller-manager-operator_02_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_40_kube-storage-version-migrator-operator_00_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_40_kube-storage-version-migrator-operator_00_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_40_cloud-credential-operator_00_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_40_cloud-credential-operator_00_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_30_openshift-apiserver-operator_01_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_30_openshift-apiserver-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_10_config-operator_01_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_10_config-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/networkoperator/v1/001-egressrouter.crd.yaml
Auto-merging vendor/github.com/openshift/api/network/v1/004-egressnetworkpolicy-crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/network/v1/004-egressnetworkpolicy-crd.yaml
Auto-merging vendor/github.com/openshift/api/network/v1/003-netnamespace-crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/network/v1/003-netnamespace-crd.yaml
Auto-merging vendor/github.com/openshift/api/network/v1/002-hostsubnet-crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/network/v1/002-hostsubnet-crd.yaml
Auto-merging vendor/github.com/openshift/api/network/v1/001-clusternetwork-crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/network/v1/001-clusternetwork-crd.yaml
Auto-merging vendor/github.com/openshift/api/imageregistry/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/imageregistry/v1/types.go
Auto-merging vendor/github.com/openshift/api/imageregistry/v1/01-crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/imageregistry/v1/01-crd.yaml
Auto-merging vendor/github.com/openshift/api/imageregistry/v1/00-crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/imageregistry/v1/00-crd.yaml
Auto-merging vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
Auto-merging vendor/github.com/openshift/api/go.sum
Auto-merging vendor/github.com/openshift/api/go.mod
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/go.mod
Auto-merging vendor/github.com/openshift/api/console/v1alpha1/0000_10_consoleplugin.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1alpha1/0000_10_consoleplugin.crd.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/0000_10_consoleyamlsample.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/0000_10_consoleyamlsample.crd.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/0000_10_consolequickstart.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/0000_10_consolequickstart.crd.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/0000_10_consolenotification.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/0000_10_consolenotification.crd.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/0000_10_consolelink.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/0000_10_consolelink.crd.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/0000_10_consoleexternalloglink.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/0000_10_consoleexternalloglink.crd.yaml
Auto-merging vendor/github.com/openshift/api/console/v1/0000_10_consoleclidownload.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/console/v1/0000_10_consoleclidownload.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_ingress.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_infrastructure.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_feature.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_cluster_version.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_apiserver.go
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
Auto-merging vendor/github.com/openshift/api/cloudnetwork/v1/001-cloudprivateipconfig.crd.yaml
Auto-merging vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/build/v1/types.go
Auto-merging vendor/github.com/openshift/api/build/v1/generated.proto
Auto-merging vendor/github.com/openshift/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
Auto-merging vendor/github.com/openshift/api/apiserver/v1/apiserver.openshift.io_apirequestcount.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/apiserver/v1/apiserver.openshift.io_apirequestcount.yaml
Auto-merging vendor/github.com/openshift/api/Makefile
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1986129: Bump openshift/api to add missing 'include.release.openshift.io/single-node-developer' annotation to the ConsolePlugin CRD
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 release-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
Reviewers

@spadgett spadgett spadgett approved these changes

@yanpzhan yanpzhan Awaiting requested review from yanpzhan

@bparees bparees Awaiting requested review from bparees

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jhadvig @openshift-bot @openshift-cherrypick-robot @spadgett