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

Bug 1879047: bump prometheus-operator 0.42 #928

Merged
merged 5 commits into from Sep 21, 2020
Merged

Bug 1879047: bump prometheus-operator 0.42 #928

merged 5 commits into from Sep 21, 2020

Conversation

s-urbaniak
Copy link
Contributor

@s-urbaniak s-urbaniak commented Sep 15, 2020 •
edited

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

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Sep 15, 2020
@openshift-ci-robot
Copy link
Contributor

@s-urbaniak: This pull request references Bugzilla bug 1879047, which is valid. 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.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1879047: bump prometheus-operator 0.42

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-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 15, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 15, 2020
@s-urbaniak s-urbaniak mentioned this pull request Sep 15, 2020
Merged
@openshift-ci-robot
Copy link
Contributor

@s-urbaniak: This pull request references Bugzilla bug 1879047, which is valid.

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

In response to this:

Bug 1879047: bump prometheus-operator 0.42

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.

s-urbaniak
s-urbaniak commented Sep 15, 2020
View reviewed changes
CHANGELOG.md
- [#928](https://github.com/openshift/cluster-monitoring-operator/pull/928) Bump prometheus-operator 0.42:
- 0.42.0 changes: https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.42.0
- 0.41.1 changes: https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.41.1
- 0.41.0 changes: https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.41.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this sufficient for us? 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes even just bump to Prometheus operator 0.42 would be enough. 👍

@s-urbaniak
Copy link
Contributor Author

/cc @openshift/openshift-team-monitoring

@openshift-ci-robot openshift-ci-robot requested a review from a team September 15, 2020 12:35
@s-urbaniak
Copy link
Contributor Author

This e2e failure looks suspicious, investigating:

    alertmanager_test.go:273: request failed: Post "https://127.0.0.1:38151/api/v2/silences?namespace=test-kube-rbac-proxy": dial tcp 127.0.0.1:38151: connect: connection refused

@s-urbaniak
Copy link
Contributor Author

I cannot find anything suspicious in the logs, assuming network hiccups, hence retrying.

@lilic
Copy link
Contributor

lilic commented Sep 16, 2020

/retest

paulfantom
paulfantom reviewed Sep 16, 2020
View reviewed changes
CHANGELOG.md
@@ -2,6 +2,10 @@

## 4.6

- [#928](https://github.com/openshift/cluster-monitoring-operator/pull/928) Bump prometheus-operator 0.42:
- 0.42.0 changes: https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.42.0
- 0.41.1 changes: https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.41.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those features are also included in 0.42, so including 0.41.1 changelog seems redundant

@s-urbaniak
Copy link
Contributor Author

/test e2e

1 similar comment
@s-urbaniak
Copy link
Contributor Author

/test e2e

@simonpasquier
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2020
@s-urbaniak
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 21, 2020
@s-urbaniak
Copy link
Contributor Author

there is one thing missing: the cluster role binding to be allowed to operate on Probe custom resources.

@lilic
Copy link
Contributor

lilic commented Sep 21, 2020

@s-urbaniak should this be added in upstream or is this downstream patch we always do?

@s-urbaniak
Copy link
Contributor Author

@lilic it is already present in upstream, but we refer to 0.40 cluster role bindings here. I am a bit unsure if this mixture of 0.40 and 0.42 assets is a good idea tbh 🤔 it introduces quite some intricate complexity.

@s-urbaniak
Copy link
Contributor Author

changing strategy: we'll bump prometheus-operator 0.42 in release-0.6 branch of kube-prometheus and bump the latter here instead of monkey patching jsonnet assets.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2020
simonpasquier
simonpasquier reviewed Sep 21, 2020
View reviewed changes
Copy link
Contributor

@simonpasquier simonpasquier 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: s-urbaniak, simonpasquier

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 [s-urbaniak,simonpasquier]

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

@s-urbaniak
Copy link
Contributor Author

/test e2e-aws-operator

@s-urbaniak
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 21, 2020
@openshift-bot
Copy link
Contributor

/retest

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

@s-urbaniak
Copy link
Contributor Author

/test e2e-aws-operator

@openshift-merge-robot openshift-merge-robot merged commit b586835 into openshift:master Sep 21, 2020
@openshift-ci-robot
Copy link
Contributor

@s-urbaniak: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state.

Bugzilla bug 1879047 has not been moved to the MODIFIED state.

In response to this:

Bug 1879047: bump prometheus-operator 0.42

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.

@s-urbaniak s-urbaniak deleted the bz-1879047 branch September 21, 2020 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonpasquier simonpasquier simonpasquier left review comments

@paulfantom paulfantom paulfantom left review comments

@lilic lilic lilic left review comments

@pgier pgier Awaiting requested review from pgier

Assignees

@simonpasquier simonpasquier

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-low Referenced Bugzilla bug's severity is low 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
7 participants
@s-urbaniak @openshift-ci-robot @lilic @simonpasquier @openshift-bot @paulfantom @openshift-merge-robot