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 1899839: jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field #1023

Merged
merged 3 commits into from Dec 17, 2020
Merged

Bug 1899839: jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field #1023

merged 3 commits into from Dec 17, 2020

Conversation

lilic
Copy link
Contributor

@lilic lilic commented Dec 15, 2020 •
edited

The user configuration was not propagated correctly as we were modifying the container resources via merging directly, but thanos ruler CR exposes this configuration so we should use that instead.

Opening PR to test easier, but plan on adding a test for this as well in our e2e UWM stack.

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

@lilic
jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field
6e5bdf7 
for thanos ruler container. Otherwise when we override this when user
configures it, we will not be able to override this.
@lilic
assets: Regenerate manifest
1cd8ff6
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 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 Dec 15, 2020
@lilic lilic force-pushed the fix-thanos-ruler-res branch 2 times, most recently from 286561d to 94ac4bd Compare December 16, 2020 15:09
@lilic lilic changed the title WIP: jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field Dec 17, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 17, 2020
@lilic
Copy link
Contributor Author

lilic commented Dec 17, 2020

@openshift/openshift-team-monitoring PTAL thanks!

@lilic lilic changed the title jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field Bug 1899839: jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field Dec 17, 2020
@openshift-ci-robot openshift-ci-robot added 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. labels Dec 17, 2020
@openshift-ci-robot
Copy link
Contributor

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

In response to this:

Bug 1899839: jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field

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.

@paulfantom
Copy link
Contributor

/lgtm

1 similar comment
@s-urbaniak
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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

1 similar comment
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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

@lilic
Copy link
Contributor Author

lilic commented Dec 17, 2020

/cherry-pick 4.6

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick 4.6

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-merge-robot openshift-merge-robot merged commit 585145f into openshift:master Dec 17, 2020
@openshift-ci-robot
Copy link
Contributor

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

Bugzilla bug 1899839 has been moved to the MODIFIED state.

In response to this:

Bug 1899839: jsonnet/thanos-ruler.jsonnet: Set resources to the native spec field

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-cherrypick-robot
Copy link

@lilic: cannot checkout 4.6: error checking out 4.6: exit status 1. output: error: pathspec '4.6' did not match any file(s) known to git

In response to this:

/cherry-pick 4.6

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.

@lilic lilic deleted the fix-thanos-ruler-res branch January 4, 2021 13:09
@lilic lilic mentioned this pull request Jan 4, 2021
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s-urbaniak s-urbaniak Awaiting requested review from s-urbaniak

@simonpasquier simonpasquier Awaiting requested review from simonpasquier

Assignees

@s-urbaniak s-urbaniak

@paulfantom paulfantom

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. 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
6 participants
@lilic @openshift-ci-robot @paulfantom @s-urbaniak @openshift-cherrypick-robot @openshift-merge-robot