Bug 1961158: Changing resolver to address thanos-ruler pod issues

[prashbnair]

• I added CHANGELOG entry for this change.
• Change is not relevant to the end user.

Changes

Verification

[openshift-ci]

@prashbnair: This pull request references Bugzilla bug 1961158, which is invalid:

• expected the bug to target the "4.6.z" release, but it targets "---" instead
• expected Bugzilla bug 1961158 to depend on a bug targeting a release in 4.7.0, 4.7.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1961158: Changing resolver to address thanos pod issues

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]

Hi @prashbnair. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[prashbnair]

/bugzilla refresh

[openshift-ci]

@prashbnair: This pull request references Bugzilla bug 1961158, which is invalid:

• expected the bug to target the "4.6.z" release, but it targets "---" instead
• expected Bugzilla bug 1961158 to depend on a bug targeting a release in 4.7.0, 4.7.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

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.

[kakkoyun]

Rather than modifying the downstream fork's default value, why can't we just change the value of the flag?

[prashbnair]

/bugzilla refresh

[openshift-ci]

@prashbnair: This pull request references Bugzilla bug 1961158, 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.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.6.z) matches configured target release for branch (4.6.z)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1957646 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
• dependent Bugzilla bug 1957646 targets the "4.7.z" release, which is one of the valid target releases: 4.7.0, 4.7.z
• bug has dependents

Requesting review from QA contact:
/cc @juzhao

In response to this:

/bugzilla refresh

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.

[prashbnair]

@simonpasquier Can you please let @kakkoyun know why it was done this way in 4.7

[simonpasquier]

Rather than modifying the downstream fork's default value, why can't we just change the value of the flag?

Because the prometheus operator doesn't allow you to set the flag in a simple fashion: the resolver flag being hidden, we can't reasonably expose it in the Thanos ruler CRD and merge patch doesn't work because the container's args field is an array and the merge operation would replace the array generated by the operator.
I've raised the question in thanos-io#4204, happy to hear your feedback :)

In the short term, patching the downstream fork is unfortunately our only viable option since this issue blocks our ability to merge anything on the release-4.6 branch in CMO.

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: prashbnair, 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 [simonpasquier]

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

[dgrisonnet]

/ok-to-test

[juzhao]

/bugzilla cc-qa

[openshift-ci]

@juzhao: This pull request references Bugzilla bug 1961158, which is valid.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.6.z) matches configured target release for branch (4.6.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1957646 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
• dependent Bugzilla bug 1957646 targets the "4.7.z" release, which is one of the valid target releases: 4.7.0, 4.7.z
• bug has dependents

Requesting review from QA contact:
/cc @juzhao

In response to this:

/bugzilla cc-qa

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.

[juzhao]

tested with the not merged PR, issue is fixed
/label qe-approved

[openshift-ci]

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

• openshift/thanos#57

Bugzilla bug 1961158 has been moved to the MODIFIED state.

In response to this:

Bug 1961158: Changing resolver to address thanos-ruler pod issues

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.