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

go deps: update prometheus/client_golang #1711

Merged
merged 2 commits into from
Jun 15, 2022

Conversation

iamniting
Copy link
Member

@iamniting
Copy link
Member Author

/cherry-pick release-4.11

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-4.11

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
Member

@jarrpa jarrpa 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 Jun 14, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 14, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, jarrpa

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 Jun 14, 2022
@iamniting
Copy link
Member Author

/retest

@jarrpa
Copy link
Member

jarrpa commented Jun 14, 2022

/test ocs-operator-ci

1 similar comment
@jarrpa
Copy link
Member

jarrpa commented Jun 15, 2022

/test ocs-operator-ci

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 15, 2022

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

Test name Commit Details Required Rerun command
ci/prow/red-hat-storage-ocs-ci-e2e-aws 99579d9 link false /test red-hat-storage-ocs-ci-e2e-aws

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.

@iamniting
Copy link
Member Author

/test ocs-operator-ci

@openshift-merge-robot openshift-merge-robot merged commit 423965b into red-hat-storage:main Jun 15, 2022
@openshift-cherrypick-robot

@iamniting: #1711 failed to apply on top of branch "release-4.11":

Applying: go deps: update prometheus/client_golang
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging 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 go deps: update prometheus/client_golang
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.11

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.

iamniting added a commit to iamniting/odf-operator that referenced this pull request Jun 15, 2022
ocs-operator started using new prometheus/client_golang version and we
also use the old version. updating ocs-operator will update the both of
them.

red-hat-storage/ocs-operator#1711

https://bugzilla.redhat.com/show_bug.cgi?id=2056104

Signed-off-by: Nitin Goyal <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/odf-operator that referenced this pull request Jun 15, 2022
ocs-operator started using new prometheus/client_golang version and we
also use the old version. updating ocs-operator will update the both of
them.

red-hat-storage/ocs-operator#1711

https://bugzilla.redhat.com/show_bug.cgi?id=2056104

Signed-off-by: Nitin Goyal <[email protected]>
@iamniting iamniting deleted the prometheus branch April 19, 2023 05:32
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.

4 participants