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.

Sign up for GitHub

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

Sync with kube-prometheus #1236

Merged
merged 1 commit into from Jun 23, 2021
Merged

Sync with kube-prometheus #1236

merged 1 commit into from Jun 23, 2021

Conversation

philipgough
Copy link
Contributor

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci openshift-ci bot requested review from arajkumar and jan--f June 22, 2021 11:34
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2021
@paulfantom
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2021
@jan--f
Copy link
Contributor

jan--f commented Jun 22, 2021

I guess the permission change to hack/merge_cluster_roles.py was intentional? I don't think we need to change this PR but generally future me is a fan of mentioning such a change in the commit message/add a dedicated commit :)

@jan--f
Copy link
Contributor

jan--f commented Jun 22, 2021

/lgtm

@philipgough
Copy link
Contributor Author

philipgough commented Jun 22, 2021 •
edited

I guess the permission change to hack/merge_cluster_roles.py was intentional? I don't think we need to change this PR but generally future me is a fan of mentioning such a change in the commit message/add a dedicated commit :)

Ack, no it wasn't I was fighting make generate and a Python install on OSX and did not mean to commit it, will amend

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2021
@philipgough
Copy link
Contributor Author

/test e2e-aws-single-node

@paulfantom
Copy link
Contributor

I guess the permission change to hack/merge_cluster_roles.py was intentional?

We are removing that script in #1230 either way :)

/lgtm

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

openshift-ci bot commented Jun 22, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, paulfantom, PhilipGough

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:
  • OWNERS [PhilipGough,jan--f,paulfantom]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@philipgough
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

8 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 44cab0c into openshift:master Jun 23, 2021
@philipgough philipgough deleted the bz-1913618 branch June 23, 2021 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arajkumar arajkumar Awaiting requested review from arajkumar

@jan--f jan--f Awaiting requested review from jan--f

Assignees

@jan--f jan--f

@paulfantom paulfantom

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@philipgough @paulfantom @jan--f @openshift-bot @openshift-merge-robot