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

Bug 1950993: UPSTREAM: <drop>: bump cadvisor for 2868 and 2925 upstream patches #892

Merged
merged 2 commits into from Aug 25, 2021

Conversation

harche
Copy link

@harche harche commented Aug 18, 2021

Signed-off-by: Harshal Patil harpatil@redhat.com

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes # https://bugzilla.redhat.com/show_bug.cgi?id=1950993

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Aug 18, 2021
@openshift-ci openshift-ci bot added the kind/bug Categorizes issue or PR as related to a bug. label Aug 18, 2021
@openshift-ci-robot
Copy link

@harche: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

@openshift-ci openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Aug 18, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 18, 2021

@harche: This pull request references Bugzilla bug 1950993, 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)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (weinliu@redhat.com), skipping review request.

In response to this:

Bug 1950993: Pin cadvisor to openshift/google-cadvisor

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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. vendor-update Touching vendor dir or related files labels Aug 18, 2021
@openshift-ci openshift-ci bot requested review from mfojtik and soltysh August 18, 2021 10:09
@harche harche changed the title Bug 1950993: Pin cadvisor to openshift/google-cadvisor Bug 1950993: UPSTREAM: <drop>: bump cadvisor for 2868 upstream patch Aug 18, 2021
Signed-off-by: Harshal Patil <harpatil@redhat.com>
@openshift-ci-robot
Copy link

@harche: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

@rphillips
Copy link

/lgtm
/retest-required

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 25, 2021
Signed-off-by: Harshal Patil <harpatil@redhat.com>
@openshift-ci-robot
Copy link

@harche: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 25, 2021
@harche harche changed the title Bug 1950993: UPSTREAM: <drop>: bump cadvisor for 2868 upstream patch Bug 1950993: UPSTREAM: <drop>: bump cadvisor for 2868 and 2925 upstream patches Aug 25, 2021
@openshift-ci-robot
Copy link

@harche: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

@rphillips
Copy link

/lgtm

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

mrunalp commented Aug 25, 2021

/approve

@openshift-ci
Copy link

openshift-ci bot commented Aug 25, 2021

@harche: 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-agnostic-cmd b811617 link /test e2e-agnostic-cmd

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.

@mrunalp mrunalp added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Aug 25, 2021
@openshift-merge-robot openshift-merge-robot merged commit 33d0ffa into openshift:master Aug 25, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 25, 2021

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

Bugzilla bug 1950993 has been moved to the MODIFIED state.

In response to this:

Bug 1950993: UPSTREAM: : bump cadvisor for 2868 and 2925 upstream patches

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

openshift-ci bot commented Aug 25, 2021

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: harche, mrunalp, rphillips

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

@rphillips
Copy link

/cherry-pick release-4.8

@openshift-cherrypick-robot

@rphillips: #892 failed to apply on top of branch "release-4.8":

Applying: UPSTREAM: <drop>: bump cadvisor for 2868 upstream patch
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/src/k8s.io/api/go.mod
M	staging/src/k8s.io/api/go.sum
M	staging/src/k8s.io/apiextensions-apiserver/go.mod
M	staging/src/k8s.io/apiextensions-apiserver/go.sum
M	staging/src/k8s.io/apiserver/go.mod
M	staging/src/k8s.io/apiserver/go.sum
M	staging/src/k8s.io/cli-runtime/go.mod
M	staging/src/k8s.io/cli-runtime/go.sum
M	staging/src/k8s.io/cloud-provider/go.mod
M	staging/src/k8s.io/cloud-provider/go.sum
M	staging/src/k8s.io/controller-manager/go.mod
M	staging/src/k8s.io/controller-manager/go.sum
M	staging/src/k8s.io/kube-aggregator/go.sum
M	staging/src/k8s.io/kubectl/go.mod
M	staging/src/k8s.io/kubectl/go.sum
M	staging/src/k8s.io/legacy-cloud-providers/go.mod
M	staging/src/k8s.io/legacy-cloud-providers/go.sum
M	vendor/github.com/google/cadvisor/manager/manager.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
Auto-merging staging/src/k8s.io/legacy-cloud-providers/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/legacy-cloud-providers/go.sum
Auto-merging staging/src/k8s.io/legacy-cloud-providers/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/legacy-cloud-providers/go.mod
Auto-merging staging/src/k8s.io/kubectl/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubectl/go.sum
Auto-merging staging/src/k8s.io/kubectl/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/kubectl/go.mod
Auto-merging staging/src/k8s.io/kube-aggregator/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/kube-aggregator/go.sum
Auto-merging staging/src/k8s.io/controller-manager/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/controller-manager/go.sum
Auto-merging staging/src/k8s.io/controller-manager/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/controller-manager/go.mod
Auto-merging staging/src/k8s.io/cloud-provider/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cloud-provider/go.sum
Auto-merging staging/src/k8s.io/cloud-provider/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cloud-provider/go.mod
Auto-merging staging/src/k8s.io/cli-runtime/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/cli-runtime/go.sum
Auto-merging staging/src/k8s.io/cli-runtime/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/cli-runtime/go.mod
Auto-merging staging/src/k8s.io/apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiserver/go.sum
Auto-merging staging/src/k8s.io/apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiserver/go.mod
Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiextensions-apiserver/go.sum
Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/apiextensions-apiserver/go.mod
Auto-merging staging/src/k8s.io/api/go.sum
CONFLICT (content): Merge conflict in staging/src/k8s.io/api/go.sum
Auto-merging staging/src/k8s.io/api/go.mod
CONFLICT (content): Merge conflict in staging/src/k8s.io/api/go.mod
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 UPSTREAM: <drop>: bump cadvisor for 2868 upstream patch
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
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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants