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

[release-4.14] k8s: taints: import package #754

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #746

/assign ffromani

to remove the last dependency from k8s.io/kubernetes,
we import (soft-fork) the taints package, and we fix
our imports to use the bundled version.

Signed-off-by: Francesco Romani <[email protected]>
remove now-unnecessary deps

Signed-off-by: Francesco Romani <[email protected]>
@ffromani
Copy link
Member

/approve
/lgtm
/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link
Author

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

In response to this:

/approve
/lgtm
/cherry-pick release-4.13

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 added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ffromani, 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:

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 Oct 27, 2023
@openshift-ci openshift-ci bot merged commit 576fd12 into openshift-kni:release-4.14 Oct 27, 2023
@openshift-cherrypick-robot
Copy link
Author

@ffromani: #754 failed to apply on top of branch "release-4.13":

Applying: test: e2e: import and use the taints pkg from k8s
Applying: deps: k8s: clean up
Using index info to reconstruct a base tree...
M	vendor/k8s.io/kubernetes/pkg/apis/core/helper/helpers.go
M	vendor/k8s.io/kubernetes/pkg/apis/core/types.go
M	vendor/k8s.io/kubernetes/pkg/apis/core/zz_generated.deepcopy.go
M	vendor/k8s.io/kubernetes/pkg/util/taints/taints.go
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
CONFLICT (modify/delete): vendor/k8s.io/kubernetes/pkg/util/taints/taints.go deleted in deps: k8s: clean up and modified in HEAD. Version HEAD of vendor/k8s.io/kubernetes/pkg/util/taints/taints.go left in tree.
CONFLICT (modify/delete): vendor/k8s.io/kubernetes/pkg/apis/core/zz_generated.deepcopy.go deleted in deps: k8s: clean up and modified in HEAD. Version HEAD of vendor/k8s.io/kubernetes/pkg/apis/core/zz_generated.deepcopy.go left in tree.
CONFLICT (modify/delete): vendor/k8s.io/kubernetes/pkg/apis/core/types.go deleted in deps: k8s: clean up and modified in HEAD. Version HEAD of vendor/k8s.io/kubernetes/pkg/apis/core/types.go left in tree.
Removing vendor/k8s.io/kubernetes/pkg/apis/core/toleration.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/taint.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/resource.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/register.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/objectreference.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/json.go
CONFLICT (modify/delete): vendor/k8s.io/kubernetes/pkg/apis/core/helper/helpers.go deleted in deps: k8s: clean up and modified in HEAD. Version HEAD of vendor/k8s.io/kubernetes/pkg/apis/core/helper/helpers.go left in tree.
Removing vendor/k8s.io/kubernetes/pkg/apis/core/doc.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/annotation_key_constants.go
Removing vendor/k8s.io/kubernetes/pkg/apis/core/OWNERS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 deps: k8s: clean up
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:

/approve
/lgtm
/cherry-pick release-4.13

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.

2 participants